Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,297 Commits 3 Branches 0 Tags
df1a9dab5146f6cb70058a4becbf7d53481da451
Commit Graph

25339 Commits

Author SHA1 Message Date
Kenny Root
df1a9dab51 am 871e27ea: am 24271a8c: Merge "Use shared app gid for forward-locked processes" into jb-mr1-dev 
* commit '871e27eabc626dd50191df6c3bb3350214612c9b':
  Use shared app gid for forward-locked processes
 2012-09-13 14:48:25 -07:00
Kenny Root
24271a8c4c Merge "Use shared app gid for forward-locked processes" into jb-mr1-dev 2012-09-13 14:43:20 -07:00
Craig Mautner
6203352e3d am 6274d4b8: am dcd8c81b: Merge "Propagate systemUiVisibility changes to window manager" into jb-mr1-dev 
* commit '6274d4b80a8c1078727f53f9e7a1ff9ff8c76d02':
  Propagate systemUiVisibility changes to window manager
 2012-09-13 14:13:35 -07:00
Eino-Ville Talvala
1d5101e3af am e8040697: am f353f948: Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr1-dev 
* commit 'e80406979f6b00ab7669991479b8aa69026f0775':
  NEW_API: Unhide android.hardware.Camera#enableShutterSound
 2012-09-13 14:12:35 -07:00
Jeff Sharkey
870c5d56b3 am 2b28b37b: am cae22d83: Merge "Give DefaultContainerService all external storage." into jb-mr1-dev 
* commit '2b28b37b201e621e316eb778cdc5c1669d0e3506':
  Give DefaultContainerService all external storage.
 2012-09-13 14:11:17 -07:00
Dianne Hackborn
a60b8c4116 am 6800800c: am 3e451fa1: Merge "New permissions UI, again." into jb-mr1-dev 
* commit '6800800c42fc288fc9977d5f8d5ec6d6876033a4':
  New permissions UI, again.
 2012-09-13 14:10:34 -07:00
Christopher Tate
fc06d26149 am af40ea4c: am 79cf1a22: Merge "Moved a few telephony settings from Secure to Global" into jb-mr1-dev 
* commit 'af40ea4cc2da36475965e0562f36d8e1b81f4344':
  Moved a few telephony settings from Secure to Global
 2012-09-13 14:04:30 -07:00
Fabrice Di Meglio
694cb605a6 am cbfbb572: am bbbb154c: Merge "Fix Javadoc spelling" into jb-mr1-dev 
* commit 'cbfbb5728fce0c3bde1eecf1b98a2b8534464ffc':
  Fix Javadoc spelling
 2012-09-13 14:04:24 -07:00
Chet Haase
8476d944bf am b451f77e: am 0c348b6d: Merge "end() a reverse()\'d animation correctly" into jb-mr1-dev 
* commit 'b451f77ee2291687268d611f27c6acf0862d430d':
  end() a reverse()'d animation correctly
 2012-09-13 14:04:17 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
Selim Gurun
41ecd35fd9 am 3591fa3b: am 2fa10c67: Fix build break 
* commit '3591fa3bcd6c5204c6b0d470a186535b65b14042':
  Fix build break
 2012-09-12 15:14:09 -07:00
Eino-Ville Talvala
ef492d3da3 am 94aa95be: am a910390b: Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev 
* commit '94aa95beca8482bb8f5cf9f9bd0c26b9738d2f51':
  Camera: Add SCENE_MODE_HDR.
 2012-09-12 15:14:05 -07:00
Eino-Ville Talvala
e8eb5951b2 am 9725ff46: am 6fc7275d: Merge "Camera: Add enableShutterSound method." into jb-mr1-dev 
* commit '9725ff46c445f9d259bdee18ed86072a937ba117':
  Camera: Add enableShutterSound method.
 2012-09-12 15:13:46 -07:00
Selim Gurun
5977ecef0e am a7a5fa82: am 06ee8cde: Merge "Remove defunct searchbox implementation from webview." into jb-mr1-dev 
* commit 'a7a5fa82cc997953b0206c4dd1d2ecc1b27f0cf2':
  Remove defunct searchbox implementation from webview.
 2012-09-12 15:13:43 -07:00
Selim Gurun
f4fd2eb5ee Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev 2012-09-12 13:41:09 -07:00
Selim Gurun
b4c02e6ffd Minor update to addjavascriptinterface documentation 
Change-Id: I67525673e3d061e00fbe8989c08050ad84e78920
 2012-09-12 13:36:21 -07:00