Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
Hui Shu
00207f564d am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '4e0ad44fcac48b2be77bd116ffdb696cb6490829':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:39:00 +00:00
Patrick Tjin
df670e7347 am dea847c2: Skip over directories when iterating tombstones 
* commit 'dea847c2ace8894a595cf9bd87764ce2ca9698ab':
  Skip over directories when iterating tombstones
 2014-10-01 22:38:31 +00:00
John Reck
5451afcae7 am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit '8786a962f0aa9991e0bc668eb7d9eae45645409e':
  Re-allow suppressing onDetachedFromWindow
 2014-10-01 22:37:41 +00:00
Hui Shu
4979a6ade1 am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit 'aee5c9e7c1f61126c61722a957daedf57cf26e7e':
  Remove WebView DRP Setting from Developer Settings
 2014-10-01 22:37:23 +00:00
Craig Mautner
6f357112f8 am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '245645ca460150b4030d84c88faa931345a90a50':
  Don't clear visible-behind activity if it is top
 2014-10-01 22:36:47 +00:00
Narayan Kamath
1ff5abdbb1 am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit '7dc7f676d699c739128dcc7855cbc0dacddaaa57':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 22:35:50 +00:00
Jerome Poichet
8be1828ae9 am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit '72079f7f9b644e57169e26597ec7c727786071a1':
  Make sure cancel is called on tear down.
 2014-10-01 22:34:24 +00:00
Hui Shu
5f961157c4 am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '888fd710cd9ae569d47e1795f47e2ad909b5c8df':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:25:53 +00:00
Patrick Tjin
cae740173f am f7c59190: am dea847c2: Skip over directories when iterating tombstones 
* commit 'f7c59190f7f0ece82b98ed61ca16d5f7ab20dc0d':
  Skip over directories when iterating tombstones
 2014-10-01 22:18:04 +00:00
John Reck
d644facfcd am f408656a: am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit 'f408656a731328694b3ffee2f588263d60349dc3':
  Re-allow suppressing onDetachedFromWindow
 2014-10-01 22:16:43 +00:00
Hui Shu
7ce8d27fcd am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '9cd616e067b9049c87ad5064d3cf4b8cc380ddfa':
  Remove WebView DRP Setting from Developer Settings
 2014-10-01 22:15:52 +00:00
Hui Shu
888fd710cd am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '4e0ad44fcac48b2be77bd116ffdb696cb6490829':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:15:20 +00:00
Narayan Kamath
89f3665dac am 17044459: am 870c3553: am 13705ca9: am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit '170444599ce44b3b427267a190bed79d9afb709d':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 22:13:28 +00:00
Jerome Poichet
4df8a1e369 am c2ece422: am 87ed0483: am 0d71155d: am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit 'c2ece4228d64a5621bdadc042d3182af89141f8c':
  Make sure cancel is called on tear down.
 2014-10-01 22:13:02 +00:00
Hui Shu
4e0ad44fca Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 2014-10-01 22:10:23 +00:00
Narayan Kamath
170444599c am 870c3553: am 13705ca9: am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit '870c3553f15d9d085bb30b063563143c2fd09322':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 22:02:44 +00:00
Jerome Poichet
c2ece4228d am 87ed0483: am 0d71155d: am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit '87ed04832c7562260c3a87506286d63b137daee1':
  Make sure cancel is called on tear down.
 2014-10-01 22:02:16 +00:00
Jeff Brown
05af6adb8d Implement auto-sleep functionality. 
Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity.  By default this
value is set to -1 which maintains today's existing behavior.

We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM.  When the sleep timeout expires, the state is cleared and
the dream ends.

Bug: 17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
 2014-10-01 15:01:10 -07:00
Hui Shu
2267177279 Revert "Remove WebView DRP Setting from Developer Settings" 
This reverts commit eb487c6301.

Change-Id: Ie38a24efe2ea015b971cb0a05eca321299898538
 2014-10-01 21:41:07 +00:00
Patrick Tjin
f7c59190f7 am dea847c2: Skip over directories when iterating tombstones 
* commit 'dea847c2ace8894a595cf9bd87764ce2ca9698ab':
  Skip over directories when iterating tombstones
 2014-10-01 21:29:52 +00:00
George Mount
24314e7d10 Fix ChangeTransform works only once on a View. 
Bug 17762118

When ChangeTransform is used on a View, its intermediate values
are being set, but not cleared after the transition completes
unless it uses a GhostView. This CL clears the intermediate
values when the animation ends if no GhostView is used.

Change-Id: I2590d9c2bc36d31023b3e1af94d2bd72c9589eb5
 2014-10-01 14:28:05 -07:00
Patrick Tjin
dea847c2ac Skip over directories when iterating tombstones 
Bug: 17380601
Change-Id: Idb6e559a89c7438751bd7a52375b9789454e0334
 2014-10-01 21:17:52 +00:00
Mick Lin
97850c066b [DS] DSDS support for widget view 
Change-Id: If8b8410eb3cc471933f0b109973ea1f43fe5e791
 2014-10-01 13:56:36 -07:00
John Reck
f408656a73 am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit '8786a962f0aa9991e0bc668eb7d9eae45645409e':
  Re-allow suppressing onDetachedFromWindow
 2014-10-01 19:16:07 +00:00
John Reck
8786a962f0 Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 2014-10-01 19:11:04 +00:00
Hui Shu
9cd616e067 am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit 'aee5c9e7c1f61126c61722a957daedf57cf26e7e':
  Remove WebView DRP Setting from Developer Settings
 2014-10-01 18:35:49 +00:00
Hui Shu
aee5c9e7c1 Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 2014-10-01 18:28:57 +00:00
Craig Mautner
3867e4d0c0 am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '9ab8fbbc60588b204d362bdab45d892e8274382b':
  Don't clear visible-behind activity if it is top
 2014-10-01 17:58:34 +00:00
Craig Mautner
9ab8fbbc60 am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '245645ca460150b4030d84c88faa931345a90a50':
  Don't clear visible-behind activity if it is top
 2014-10-01 17:52:57 +00:00
Craig Mautner
245645ca46 Merge "Don't clear visible-behind activity if it is top" into lmp-dev 2014-10-01 17:48:14 +00:00
John Reck
77e4a5250f Re-allow suppressing onDetachedFromWindow 
Bug: 17578553

Games seem to be doing this to prevent destruction of their
GL contexts, and they assume it works even if it doesn't. However,
GLSurfaceView is clunky here, so while the app is doing something
questionable we don't really offer a better way. For now revert
back to kitkat behavior.

Change-Id: Icfa9e496279b9cfa47f9bc7f6848d9313caed0d5
 2014-10-01 10:38:07 -07:00
Eino-Ville Talvala
25590695de am 93ac1c08: am ef7bf5f0: am bf1184e8: am 4ddacc46: am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev 
* commit '93ac1c08ac3a1e9019ad73eee9ad9059b8acaa95':
  Camera2 Legacy: Set a default thumbnail size
 2014-10-01 17:19:09 +00:00
Adam Powell
cee17901e9 am 3ea97a8d: am ac40e790: am ced21e4e: am c754382b: am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev 
* commit '3ea97a8de68fb253dd75f1a6e9ed87704d259d83':
  Inset the non-overlay contextual action bar without a status guard
 2014-10-01 17:18:49 +00:00
Alan Viverette
4589bfa9b3 am 0a059f87: am a6a9b86b: am 601fa249: am 8c14ff5c: am c44c77d3: Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev 
* commit '0a059f87b7c23247a5a02c6b4884359ad5772110':
  Implement missing visibility management for FrameLayout foreground
 2014-10-01 17:18:45 +00:00
Ruben Brunk
b73767f3bb am e6098661: am df261085: am 4d9face6: am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev 
* commit 'e60986611fe891b47f72b47873ed87deb2e3afc2':
  camera2: Use valid dimensions for RGBA8888 gralloc buffers.
 2014-10-01 17:18:38 +00:00
Dianne Hackborn
42b7a45a56 am 67787a82: am cb5fc84b: am 16b6a8f7: am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '67787a82a01460f0d68c154fdf3045bdc1ee572f':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 17:18:29 +00:00
Svetoslav
5327f9a44e am 047ab3b2: am cf0a3373: am 344ffbc6: am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit '047ab3b2e583dcaacb6b67fd0569bfa3ecb477c2':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 17:18:25 +00:00
Winson Chung
b209a9cd15 am 07f9306e: am 69a0645e: am d1c1201d: am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 
* commit '07f9306ef47c2067cbb5ae776ce9738b0aca3cd9':
  Fixing regression with black task bar background. (Bug 17584337)
 2014-10-01 17:18:18 +00:00
Chris Wren
9ffa1e24e7 am 50555892: am edc19979: am 82ef988c: am b742c9a0: am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit '5055589269409be8d2c70d11ba8d681fd627df92':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 17:18:13 +00:00
Chris Wren
445fff144d am 8bac9b5a: am ca20e6c6: am 1d88c087: am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit '8bac9b5a6e41ad1b987ed66d255172d77d7e62a0':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 17:18:09 +00:00
Dianne Hackborn
d7c6fd2c83 am 63f38a08: am e83f322f: am 30854356: am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit '63f38a083657a4fa52377362889bef957ebbca82':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 17:17:56 +00:00
George Mount
8f2453e2bf am c416fb8c: am 8cc88125: am 6d7a0cd5: am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit 'c416fb8c62e22e4f8f21640a962dd329f87c0a37':
  Clear preordered list after use.
 2014-10-01 17:17:39 +00:00
Craig Mautner
64ccb70867 Don't clear visible-behind activity if it is top 
Previously if an activity requested to keep running behind
translucent activities (Activity.requestVisibleBehind()) and then
converted itself to opaque (Activity.convertFromTranslucent()), we
would clear the visible-behind activity. This change tests to see
if the top activity is the visible-behind activity and does not
clear it in that case.

This change also clears the visible-behind activity whenever it
comes back to the front. That forces the activity to call
requestVisibleBehind() each time it is resumed.

Fixes bug 17648436.

Change-Id: Id0fc4d7e2a2b907675305d98bad1b08cb610919e
 2014-10-01 10:14:53 -07:00
Eino-Ville Talvala
93ac1c08ac am ef7bf5f0: am bf1184e8: am 4ddacc46: am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev 
* commit 'ef7bf5f0d82cd2d898c35b17b00d1ca4b59ec02a':
  Camera2 Legacy: Set a default thumbnail size
 2014-10-01 17:10:48 +00:00
Adam Powell
3ea97a8de6 am ac40e790: am ced21e4e: am c754382b: am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev 
* commit 'ac40e79029b99ef46f68c510ef19e81363f25bab':
  Inset the non-overlay contextual action bar without a status guard
 2014-10-01 17:10:25 +00:00
Alan Viverette
0a059f87b7 am a6a9b86b: am 601fa249: am 8c14ff5c: am c44c77d3: Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev 
* commit 'a6a9b86b7a79fbb0ab5b24a9c480f4f859b47823':
  Implement missing visibility management for FrameLayout foreground
 2014-10-01 17:10:21 +00:00
Ruben Brunk
e60986611f am df261085: am 4d9face6: am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev 
* commit 'df26108539c1ca134bece1c75d96b96f71c0e3f5':
  camera2: Use valid dimensions for RGBA8888 gralloc buffers.
 2014-10-01 17:10:12 +00:00
Dianne Hackborn
67787a82a0 am cb5fc84b: am 16b6a8f7: am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'cb5fc84b554aa82a98867f997caffea3d7067033':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 17:10:04 +00:00
Svetoslav
047ab3b2e5 am cf0a3373: am 344ffbc6: am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit 'cf0a337352a228302d44f9582673c7acdba329ca':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 17:10:00 +00:00
Winson Chung
07f9306ef4 am 69a0645e: am d1c1201d: am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 
* commit '69a0645eb2025c54232c4b65544db581a183c1e7':
  Fixing regression with black task bar background. (Bug 17584337)
 2014-10-01 17:09:51 +00:00