drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,909 Commits 1 Branch 0 Tags
Commit Graph

73909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
5d724f50d4 Merge "Further isolate the Surface from WindowState." 2012-04-02 12:58:23 -07:00
Scott Main
0cf7507c6f am ae78338d: am ae66d073: am dfa3b8fa: docs: dashboard update for 4/2 
* commit 'ae78338d348baad4ce54078267aab26d76e42afa':
 2012-04-02 12:57:12 -07:00
Android Git Automerger
aa7caee5fd am 66e069e6: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit '66e069e64ff9f81d3e2ad5f4347855aeb29f1efe':
 2012-04-02 12:57:10 -07:00
Scott Main
57637f3a42 am 51635e1b: am 431d75bd: am 6a273f0d: Merge "docs: de-new a bunch of docs" into ics-mr1 
* commit '51635e1bd2fc38a0c3a3b8e6e26d7866e3063c18':
 2012-04-02 12:57:08 -07:00
Scott Main
9b0dcd34f6 am f121d840: am fe3ab03f: am dfa3b8fa: docs: dashboard update for 4/2 
* commit 'f121d840408a335fbbbeee7536a5b5546b2ad12b':
  docs: dashboard update for 4/2
 2012-04-02 12:57:06 -07:00
Craig Mautner
c8bc97e530 Further isolate the Surface from WindowState. 
Replace references to mWinAnimator.mSurface with new member
mHasSurface.

Clean up odd looping structures.

Simplify logging.

Change-Id: I9cc52a657044220d7b92528928b11bb18a724aef
 2012-04-02 12:54:54 -07:00
George Mount
a7a1d5f8da Merge "Don't show keyboard on focus change." 2012-04-02 12:51:13 -07:00
George Mount
20c19f47a1 Merge "Remove unused FORM_DID_BLUR hooks." 2012-04-02 12:50:44 -07:00
Tom Taylor
733e697776 Fix deadlock in PDU code 
Bug 6257442

If PduPersister.load bails out early and throws an exception,
it will leave the uri it's working on in an updated-locked
state. With this change, the uri is removed from the updated
list in a finally clause. The other PDU function in
this file already does the correct thing.

Change-Id: I596bd46724282b245ddba109670f3cebd61ed57c
 2012-04-02 11:58:41 -07:00
Brian Carlstrom
ac21af330d Merge "Add support for native library paths with instrumentation" 2012-04-02 11:52:22 -07:00
Wink Saville
e1bff46863 Merge "Add DebugService." 2012-04-02 11:49:53 -07:00
Scott Main
ae78338d34 am ae66d073: am dfa3b8fa: docs: dashboard update for 4/2 
* commit 'ae66d073bcdbe11e6107ff3f174519b09d1e32a6':
 2012-04-02 11:46:52 -07:00
Android Git Automerger
66e069e64f Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-04-02 11:46:50 -07:00
Scott Main
f121d84040 am fe3ab03f: am dfa3b8fa: docs: dashboard update for 4/2 
* commit 'fe3ab03f48865b80da81bc99a1bf8c3aa13cc5ad':
  docs: dashboard update for 4/2
 2012-04-02 11:45:48 -07:00
Scott Main
ae66d073bc am dfa3b8fa: docs: dashboard update for 4/2 
* commit 'dfa3b8fa4a3cb48877be364749a37acc9f08721b':
  docs: dashboard update for 4/2
 2012-04-02 11:42:04 -07:00
Scott Main
fe3ab03f48 am dfa3b8fa: docs: dashboard update for 4/2 
* commit 'dfa3b8fa4a3cb48877be364749a37acc9f08721b':
  docs: dashboard update for 4/2
 2012-04-02 11:42:01 -07:00
Gilles Debunne
b51036f72a Refactoring SpannableStringBuilder 
Made TextWatcher notification process clearer by moving it to
a single place, with methods renamed.

Also reverts CL 177544: we cannot broadcast span chages just yet,
the layout has not been reflown. A future CL will change this
behavior to make sure span changes are correctly broadcasted.

Change-Id: I9ef88dce91dff5f5f45e2845d5b3f18f1c853de3
 2012-04-02 11:33:22 -07:00
Fabrice Di Meglio
e0435a6c6a Merge "Fix layout params resolution" 2012-04-02 11:26:22 -07:00
Scott Main
dfa3b8fa4a docs: dashboard update for 4/2 
Change-Id: Id5fd6c7eaa80bba1ebea58fb7df762ea2635130d
 2012-04-02 11:14:23 -07:00
George Mount
c3cbeddcb5 Remove unused FORM_DID_BLUR hooks. 
Bug 6111763
 Webkit Change: I015e1a57e81e897c124af5d96ba76b4d07a381fc

Change-Id: I56a862a6c0f0d7799f4e935bb7f5103bb2edbb9b
 2012-04-02 11:10:57 -07:00
Brian Carlstrom
d893a890c9 Add support for native library paths with instrumentation 
(cherry picked from commit 8e658fd0415b3d6f44223c39a7e59a00cb0954aa)

Change-Id: Idb1e031d5deeea9305af8aacc17ae2d0d064dfc6
 2012-04-02 11:04:59 -07:00
Jeff Brown
3e09cc98f4 Merge "Info logs should be loggable by default." 2012-04-02 11:03:36 -07:00
Wink Saville
30ccade7f9 Add DebugService. 
This will dump the state of the telephony stack using:

  adb shell dumpsys activity service android.phone.TelephonyDebugService

The service is located in packages/app/Phone and TelephonyDebugService
instantiates DebugService and calls its dump method when asked
via the dumpsys command above.

Change-Id: I4d34c741544cafdadce2532de8b9c117a4d435a5
 2012-04-02 10:54:34 -07:00
Jeff Brown
d56feb91b4 Info logs should be loggable by default. 
Bug: 6265031
Change-Id: I6f10818c1d28fa71f434d4b372c764d04967d213
 2012-04-02 10:53:17 -07:00
Romain Guy
6db53c34a7 Fix builds without USE_OPENGL_RENDERER 
Change-Id: I84b8dfb57dcc7de700d481774efded88e51d361a
 2012-04-02 10:52:52 -07:00
George Mount
55cd3b85f3 Don't show keyboard on focus change. 
Bug 6270400
 Webkit change: I1f06b7220e22665f5932928855c81eca6534bf2f

Change-Id: I2aa65b405b3a394b55821a4d688afeb22244c2c7
 2012-04-02 10:29:12 -07:00
Michael Jurka
e6c966caa3 Merge "Add frame counter to dumpGfxInfo" 2012-04-02 09:45:36 -07:00
Scott Main
78b0d9fadd am 92d54a52: am ad85e055: am 6a273f0d: Merge "docs: de-new a bunch of docs" into ics-mr1 
* commit '92d54a52313fe9b28bcd53f361d2e7ebbd8ab18a':
  docs: de-new a bunch of docs
 2012-04-02 09:29:49 -07:00
Scott Main
51635e1bd2 am 431d75bd: am 6a273f0d: Merge "docs: de-new a bunch of docs" into ics-mr1 
* commit '431d75bdac031fd1cd9885de55462168d8d65b9b':
  docs: de-new a bunch of docs
 2012-04-02 09:27:13 -07:00
Scott Main
92d54a5231 am ad85e055: am 6a273f0d: Merge "docs: de-new a bunch of docs" into ics-mr1 
* commit 'ad85e05563b379bc889de9c7f3ab8f738340b10c':
  docs: de-new a bunch of docs
 2012-04-02 09:26:58 -07:00
Scott Main
ad85e05563 am 6a273f0d: Merge "docs: de-new a bunch of docs" into ics-mr1 
* commit '6a273f0d045951552263b1b66c34d29929c5a282':
  docs: de-new a bunch of docs
 2012-04-02 09:23:45 -07:00
Scott Main
431d75bdac am 6a273f0d: Merge "docs: de-new a bunch of docs" into ics-mr1 
* commit '6a273f0d045951552263b1b66c34d29929c5a282':
  docs: de-new a bunch of docs
 2012-04-02 09:23:40 -07:00
Scott Main
6a273f0d04 Merge "docs: de-new a bunch of docs" into ics-mr1 2012-04-02 09:21:45 -07:00
Daniel Sandler
0424716328 Merge "Show action buttons in expanded notifications." 2012-04-02 05:27:03 -07:00
satok
2c93efc9eb Hide ongoing notification icon when the screen is locked. 
Bug: 5858903
Change-Id: Ibee9123f4a520e77f4baf8bdd3d75364ab451100
 2012-04-02 19:54:28 +09:00
Dianne Hackborn
fbdff47add Merge "Fix issue #6268190" 2012-03-31 19:57:08 -07:00
Dianne Hackborn
fe2b7ccca4 Fix issue #6268190 
Change-Id: Ib269fe34c4d3e704f4080076e173241c0761040c
 2012-03-31 19:47:09 -07:00
Tony Chan
b76a5608ec am 6de59a25: am db7bb7c3: am 4ddfaeb5: Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1 
* commit '6de59a254a04ca858c7407e95cc6b8b8af3a5797':
 2012-03-31 02:23:14 -07:00
Tony Chan
dc4226a524 am af71f328: am 2963ae34: am 4ddfaeb5: Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1 
* commit 'af71f328e6b03cc6b7111b87b625c3f9cb3987e4':
  sdk doc change: Added KeyChain API Demo
 2012-03-31 02:20:37 -07:00
Tony Chan
6de59a254a am db7bb7c3: am 4ddfaeb5: Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1 
* commit 'db7bb7c3cb895087e9a2a782669414d4ff7afb66':
 2012-03-31 02:20:00 -07:00
Tony Chan
af71f328e6 am 2963ae34: am 4ddfaeb5: Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1 
* commit '2963ae34fe760211028c7a0d74e81a3dd5801f98':
  sdk doc change: Added KeyChain API Demo
 2012-03-31 02:18:02 -07:00
Tony Chan
db7bb7c3cb am 4ddfaeb5: Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1 
* commit '4ddfaeb5fe29d5dd3dbfd525e97723a972ea5a65':
  sdk doc change: Added KeyChain API Demo
 2012-03-31 02:15:49 -07:00
Tony Chan
2963ae34fe am 4ddfaeb5: Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1 
* commit '4ddfaeb5fe29d5dd3dbfd525e97723a972ea5a65':
  sdk doc change: Added KeyChain API Demo
 2012-03-31 02:15:15 -07:00
Tony Chan
4ddfaeb5fe Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1 2012-03-31 02:13:45 -07:00
Daniel Sandler
96fd7c1c1a Show action buttons in expanded notifications. 
Any notification with at least one action will now have an
expanded form by default. BigPicture/BigText can have
actions, too, of course.

Change-Id: I6f54cac65d9a9f335d8038c2105cd2c674f991ff
 2012-03-30 22:18:06 -04:00
Dianne Hackborn
61d6c8ca49 Merge "Add new feature to let apps layout over status bar / system bar." 2012-03-30 17:36:32 -07:00
Svetoslav Ganov
96695f9ba0 Merge "Added "slide" to slide-to-unlock spoken instructions." 2012-03-30 16:07:17 -07:00
Eric Laurent
3d275af3c3 Merge "implemented synchronous audio capture" 2012-03-30 16:00:26 -07:00
Fabrice Di Meglio
4a5268857e Fix layout params resolution 
- dont need to check if any parent as getResolvedLayoutDirection() is handling this case

Change-Id: I915b4a72e38d072005e47d3c5a3f63febbef6e60
 2012-03-30 15:56:48 -07:00
James Dong
18a38b9f41 Merge "Removed obsolete opencore related comments" 2012-03-30 15:55:58 -07:00