34805 Commits

Author SHA1 Message Date
Dianne Hackborn
df0ddff7e1 am 8b7c81c7: am 3c78702d: Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev
* commit '8b7c81c782947cf2614e246daa91a0b8a9fa1f0d':
  Maybe fix issue #7146119: exception in FragmentManager
2012-09-13 14:04:03 -07:00
alanv
6053088884 Add accessibility scroll actions to TabWidget
Bug: 6537369
Change-Id: I8a5bf1d6f85f0ceef316aa4a5938d32a545587db
2012-09-13 14:02:29 -07:00
Craig Mautner
dcd8c81bf4 Merge "Propagate systemUiVisibility changes to window manager" into jb-mr1-dev 2012-09-13 13:55:51 -07:00
Craig Mautner
7eac0f557c Propagate systemUiVisibility changes to window manager
The mAttachInfo.mSystemUiVisibility value was changing in
View.dispatchAttachedToWindow but
mAttachInfo.mRecomputeGlobalAttributes was not being set.
Consequently ViewRootImpl.collectViewAttributes was returning
without updating the subtreeSystemUiVisibility. This is fixed
by calling needGlobalAttributesUpdate in dispatchAttachedToWindow.

WIthin ViewRootImpl.collectViewAttributes the assignment to
subtreeSystemUiVisibility was only being made if
mAttachInfo.mSystemUiVisibility was changed within
collectViewAttributes. But mAttachInfo.mSystemUiVisibility
was changing outside of collectViewAttributes in
dispatchAttachedToWindow. Consequently subtreeSystemUiVisibility
was never updated. By looking for a mismatch between
subtreeSystemUiVisibility and mSystemUiVisibility
subtreeSystemUiVisibility gets assigned whenever it is out of
sync.

Fixes bug 7091817.

Change-Id: I1e97a7dec14dc9594876175ae26370fb9030a8a6
2012-09-13 13:14:14 -07:00
Baligh Uddin
fe11913c0c Import translations. DO NOT MERGE
Change-Id: I341b664ce8953bcea41c38b5fc7b31ae6ee9d4ee
Auto-generated-cl: translation import
2012-09-13 11:59:54 -07:00
Baligh Uddin
cf6fa9f070 Import translations. DO NOT MERGE
Change-Id: Ibc972f1a4f6689c335727a2115aaed3e47d7b339
Auto-generated-cl: translation import
2012-09-13 11:49:24 -07:00
Jeff Brown
c5df37c285 Add preliminary API for reporting display capabilities.
Change-Id: Ie18dce5b5d130f9a7cdfca08cddbf9b099312277
2012-09-13 11:45:07 -07:00
Eino-Ville Talvala
f353f948a5 Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr1-dev 2012-09-13 11:15:15 -07:00
Geremy Condra
f60921d921 Merge changes I69689a73,Iaaef6d41,I7e3cb47a,I42307f58 into jb-mr1-dev
* changes:
  DO NOT MERGE Push event logging down into libcore.EventLogger
  DO NOT MERGE Added event logging for config installation failures.
  DO NOT MERGE Create intermediate directories when installing config data.
  DO NOT MERGE Add components for the Android Config Updater to system server.
2012-09-13 10:42:22 -07:00
Dianne Hackborn
e00138285f Merge "Bring back new permission organization." into jb-mr1-dev 2012-09-13 10:40:55 -07:00
Jim Miller
7ff2cadd34 am dc663fa5: am 39de2b0e: Merge "Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it" into jb-mr1-dev
* commit 'dc663fa5df42bd1e175797e8d91c0f1ed0d275de':
  Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it
2012-09-13 03:22:27 -07:00
Jim Miller
f3254f57b8 am 208ed529: am 4f77268c: Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev
* commit '208ed529333a4c0025c5bb973cc8ebd465c4b87a':
  Initial pass at adding Music control to new keyguard.
2012-09-13 03:21:55 -07:00
Makoto Onuki
8d715a9c7f am 599023f6: am b11b9fc9: Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev
* commit '599023f639556b3c2657eb77c101db4696e15af4':
  A new broadcast action which is sent when profile changes
2012-09-13 03:21:46 -07:00
Raph Levien
9a1e732282 am fde57726: am eb1f5349: Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev
* commit 'fde5772640c7c93ffb5b541b1711552c93309e6d':
  Fix for b7155617 race condition in TextLayoutCache.cpp
2012-09-13 03:21:36 -07:00
Jeff Sharkey
cae22d83a7 Merge "Give DefaultContainerService all external storage." into jb-mr1-dev 2012-09-13 01:31:04 -07:00
Jeff Sharkey
dfa45309e0 Give DefaultContainerService all external storage.
Now we can bind to just one instance of DCS, instead of requiring
one-per-user. This also means we can operate on otherwise-stopped
users.

Bug: 7003520
Change-Id: I4881e064ae8942907f6a02c6b868926223455cdc
2012-09-13 01:04:15 -07:00
Dianne Hackborn
cd403fc031 Bring back new permission organization.
Change-Id: I83e7dd06989ab7b0116bcff5ad52d36e01b851d1
2012-09-13 00:24:38 -07:00
Dianne Hackborn
7454d3b73c New permissions UI, again.
Change-Id: I0bbecd88ff1f212b30d1ef32d5bcaa49cdf1e9ce
2012-09-12 18:57:07 -07:00
Geremy Condra
69689a7356 DO NOT MERGE Push event logging down into libcore.EventLogger
This changes the default behavior of the EventLogger from logging
to the normal logs to logging to the event logs.

Change-Id: I4338a1605928b82246a369adb3514bd31cd552e8

Conflicts:

	core/java/android/app/ActivityThread.java
2012-09-12 17:54:10 -07:00
Geremy Condra
b631084613 DO NOT MERGE Add components for the Android Config Updater to system server.
This adds the necessary bits to verify and install configuration
updates using system server. It also includes the cert pinning
updater as the first user.

Change-Id: I42307f58074157b33b6e01216aab10022340d449
2012-09-12 17:53:53 -07:00
Christopher Tate
79cf1a2291 Merge "Moved a few telephony settings from Secure to Global" into jb-mr1-dev 2012-09-12 17:51:36 -07:00
Christopher Tate
c868b645b4 Moved a few telephony settings from Secure to Global
Also tidy up the bookkeeping for a few settings that were earlier
moved to Global without the redirect tables being fixed up.

Change-Id: I69275db3b2636cd6ba9c8c51b88e97d8ba4b7b7d
2012-09-12 17:42:43 -07:00
Fabrice Di Meglio
bbbb154c89 Merge "Fix Javadoc spelling" into jb-mr1-dev 2012-09-12 17:41:27 -07:00
Chet Haase
0c348b6dd7 Merge "end() a reverse()'d animation correctly" into jb-mr1-dev 2012-09-12 17:30:16 -07:00
Dianne Hackborn
3c78702db5 Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev 2012-09-12 17:04:42 -07:00
Selim Gurun
4c6e2bb822 am 2d449a48: am f4fd2eb5: Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev
* commit '2d449a482c08d87a0d5409c1dda0695db0843c77':
  Minor update to addjavascriptinterface documentation
2012-09-12 17:03:11 -07:00
Fabrice Di Meglio
ee5be7a5e7 am 465858e7: am 2cd35662: Merge "Fix SeekBar when in RTL layout direction" into jb-mr1-dev
* commit '465858e779a79e88514a8b28df58bc089a0ee62b':
  Fix SeekBar when in RTL layout direction
2012-09-12 17:03:06 -07:00
Fabrice Di Meglio
2b668afc11 am 47e39a9f: am 88724657: Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev
* commit '47e39a9f61ae5ffdcb912c1f6196dd6f8e7478b5':
  Fix bug #7148393 Switch can crash when hierarchyviewer is connected
2012-09-12 17:03:02 -07:00
Fabrice Di Meglio
297ecb3374 am 215ce60a: am b9674640: Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev
* commit '215ce60a406c13d6963db24cc0a361da0eb64897':
  Enforce encapsulation for MarginLayoutParams startMargin and endMargin
2012-09-12 17:02:58 -07:00
Selim Gurun
36562741f9 am 6e28f1aa: am 4f8da32f: Merge "Make JavascriptInterface annotation public." into jb-mr1-dev
* commit '6e28f1aacfa4c82ab0c8b740a24ed233b031272f':
  Make JavascriptInterface annotation public.
2012-09-12 17:02:51 -07:00
Brian Carlstrom
0829a09f72 am 2e96c791: am 743115ff: Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev
* commit '2e96c791e24454cf55144c64fe77321a31b746fe':
  Tracking upgrade to bouncycastle 1.47
2012-09-12 17:02:47 -07:00
Kristian Monsen
f77e52e110 am 5710a2f1: am bd0fe878: Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev
* commit '5710a2f1269180c169855b98a8d33f2f12ced1a1':
  Deprecating methods (and a constant) for JB MR1
2012-09-12 17:02:11 -07:00
Jim Miller
6fba0a0c72 Music in keyguard improvements
- fix overscroll issue with workaround described in bug 7137941
- ignore noisy signals from music player that sometimes hide it

Change-Id: I6a25674ce7157bd70409f56881ec62644f5fce9b
2012-09-12 16:38:56 -07:00
Jeff Sharkey
116be95495 Merge commit '81eb7640' into mergeit
Conflicts:
	core/java/android/app/ActivityThread.java

Change-Id: I7bb19741ae948e4570c0882dee2558dd5ff2c350
2012-09-12 16:34:31 -07:00
Chet Haase
4dd1768643 end() a reverse()'d animation correctly
Previously, an animator that had been reverse()'d (and was thus
playing backwards) would not end() at the right value. That is, a call
to end() would cause the animation to snap to its original end value, not
the reverse-playing end value (i.e., its start value). Logic to handle
calculating the proper end value was not taking the reversing behavior
into account.

Issue #6583656 When you call end() after calling reverse() on an animation that has not started leads to forward animation finishing.

Change-Id: Ifca60a32d4973c21b85aed9c459f802526c0207e
2012-09-12 16:33:26 -07:00
Fabrice Di Meglio
61a21770b7 Fix Javadoc spelling
Change-Id: I93685d3d092ce5e16bfa0e65e11d85ae030f3f29
2012-09-12 16:33:13 -07:00
Jim Miller
4f77268c8a Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev 2012-09-12 16:16:21 -07:00
Makoto Onuki
b11b9fc997 Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev 2012-09-12 16:11:13 -07:00
Raph Levien
eb1f5349f8 Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev 2012-09-12 15:44:58 -07:00
Svetoslav Ganov
d381c620ed am 2b5c5b64: am 0bb4d078: Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev
* commit '2b5c5b640d170518ac9ddc289a49340e54ff39d0':
  Screen magnifier should handle window rebuilds correctly.
2012-09-12 15:34:32 -07:00
Christopher Tate
a25bbca8cc am ae25805d: am 99c0cb3b: Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev
* commit 'ae25805d2063d81d3e8ae786b0d972b666c5cf18':
  Set up default (random) Android IDs for all users
2012-09-12 15:34:18 -07:00
Robert Greenwalt
dd912320ff am f02e72d9: am f008ab72: am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
* commit 'f02e72d99f5d1fc05ea31676d13e7fd1e8b65c1f':
  EthernetDataTracker: indicate link up based on flags
2012-09-12 15:34:09 -07:00
Selim Gurun
c5c68d9789 am 77f02ca9: am 79ccb1e8: Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev
* commit '77f02ca908e114df2e14a7671824f3374a509280':
  Deleting the defunct SearchBox interface.
2012-09-12 15:28:53 -07:00
JP Abgrall
aef50dd148 am 0c6f1737: am d428e95e: Merge "core: config: Update the description of the autoBrightnessLevels array." into jb-mr1-dev
* commit '0c6f17370ae99b9bdd073327cad9610f08418d02':
  core: config: Update the description of the autoBrightnessLevels array.
2012-09-12 15:28:33 -07:00
Jeff Brown
984f157366 am 2eb82513: am 9ba2a188: Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev
* commit '2eb82513bd448757250dc8245e9c29c747397608':
  Don't auto-discover peers until scan requested.
  Use wfdInfo to filter available sinks.
  Allow adb shell am display-size to use bigger sizes.
2012-09-12 15:28:20 -07:00
Raph Levien
13ba4e478d Fix for b7155617 race condition in TextLayoutCache.cpp
There was the possibility for a race between clearing the caches and
using fonts. This patch simply protects both under the same mLock held
by the TextLayoutCache object.

Change-Id: Ib366e16a9a9ba702a46bc078d1bc0602713991e5
2012-09-12 15:15:51 -07:00
Selim Gurun
2137aa2afc am cccad2d8: am faed98a1: Merge "Added annotations for injected accessibility objects" into jb-mr1-dev
* commit 'cccad2d8c2ea309a73b9408f8c36e7d964627570':
  Added annotations for injected accessibility objects
2012-09-12 15:15:04 -07:00
Adam Cohen
3f3a60a037 am 2664f94f: am aec914b1: Merge "Adding notion of keyguard widgets" into jb-mr1-dev
* commit '2664f94f209100abacbfc857c33eac784f0fd6cf':
  Adding notion of keyguard widgets
2012-09-12 15:14:57 -07:00
Eino-Ville Talvala
21616b27ff am 64791aab: am ff5c9146: Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev
* commit '64791aabd4f16df4adf5ec6adf97aa2b0633dd6c':
  NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR
2012-09-12 15:14:35 -07:00
Svetoslav Ganov
bb4a9840a5 am 7abd5cfa: am c574fd04: Merge "Fixing implementation of View.requestRectangleOnScreen(Rect, boolean)." into jb-mr1-dev
* commit '7abd5cfacf3be80f79d4a01f1a60b4b7bfb411f6':
  Fixing implementation of View.requestRectangleOnScreen(Rect, boolean).
2012-09-12 15:14:21 -07:00