Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
165,550 Commits 3 Branches 0 Tags
9bdb4ba3a815719342bfcd598da52fd12a86032b
Commit Graph

46250 Commits

Author SHA1 Message Date
Craig Mautner
ce324a2da7 am bee6dfe0: am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit 'bee6dfe09d4381f9ddf666fd04012c662f31e7fd':
  Don't clear visible-behind activity if it is top
 2014-10-02 02:00:41 +00:00
Craig Mautner
bee6dfe09d am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '8a33674bed6791c63eee9d798693e25bc07b7cba':
  Don't clear visible-behind activity if it is top
 2014-10-02 00:58:50 +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
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
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
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
Chris Wren
5055589269 am edc19979: am 82ef988c: am b742c9a0: am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit 'edc199796844db9ee947165ddfff7cec810403e2':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 17:09:47 +00:00
Chris Wren
8bac9b5a6e am ca20e6c6: am 1d88c087: am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit 'ca20e6c637c34a1200f08b2de5485193bc4eb74c':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 17:09:43 +00:00
Dianne Hackborn
63f38a0836 am e83f322f: am 30854356: am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit 'e83f322fa91f64844ea24aab2944540ca43a2a01':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 17:09:29 +00:00
George Mount
c416fb8c62 am 8cc88125: am 6d7a0cd5: am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '8cc881257c6e8e9448a05e25688861536ea55971':
  Clear preordered list after use.
 2014-10-01 17:09:09 +00:00
Narayan Kamath
13705ca940 am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit 'd480147f1853e452e7e8fc4820db0e7821488289':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 15:16:34 +00:00
Jerome Poichet
0d71155d42 am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit 'a5fa02dfa8ae6e2a8cfab6489ada400f8c33f455':
  Make sure cancel is called on tear down.
 2014-10-01 15:16:12 +00:00
Eino-Ville Talvala
bf1184e8bb am 4ddacc46: am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev 
* commit '4ddacc465d52d118dedc087f68d6a00f8b419342':
  Camera2 Legacy: Set a default thumbnail size
 2014-10-01 15:15:43 +00:00
Adam Powell
ced21e4e65 am c754382b: am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev 
* commit 'c754382ba042ee0c70892b5ec33cd32c11e98d16':
  Inset the non-overlay contextual action bar without a status guard
 2014-10-01 15:15:25 +00:00
Alan Viverette
601fa2498d am 8c14ff5c: am c44c77d3: Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev 
* commit '8c14ff5cb1e742e7e57cc213f91cb76b9600479c':
  Implement missing visibility management for FrameLayout foreground
 2014-10-01 15:15:21 +00:00
Ruben Brunk
4d9face69e am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev 
* commit '7432b88447dea2a9a5b8adcfeb150da7a18d22f6':
  camera2: Use valid dimensions for RGBA8888 gralloc buffers.
 2014-10-01 15:15:14 +00:00
Dianne Hackborn
16b6a8f702 am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '962e3e831516688824fec334c5ddcfd4f3d13f44':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 15:15:07 +00:00
Svetoslav
344ffbc647 am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit '567c97881b1d1719d32daaf647979e47e01be438':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 15:15:03 +00:00
Winson Chung
d1c1201dfc am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 
* commit 'b61dea2047b1b27f169728104f8279528fbd9eac':
  Fixing regression with black task bar background. (Bug 17584337)
 2014-10-01 15:14:56 +00:00
Chris Wren
82ef988c92 am b742c9a0: am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit 'b742c9a01261075d6a85f23d72e7842dec932cda':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 15:14:52 +00:00
Chris Wren
1d88c087e6 am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit '4afe428f49533342966545a14b51acaee9052c71':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 15:14:49 +00:00
Dianne Hackborn
30854356ef am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit '29a115235832fd4ea6f6cac1ad962a3bfe6e99be':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 15:14:38 +00:00
George Mount
6d7a0cd57f am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '3dc0a918748fade0ad7c683c6bc769f032759fcd':
  Clear preordered list after use.
 2014-10-01 15:14:22 +00:00
Narayan Kamath
d480147f18 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 15:04:02 +00:00
Jerome Poichet
a5fa02dfa8 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 15:03:07 +00:00
Eino-Ville Talvala
4ddacc465d am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev 
* commit '0a62ab707977d4d6666d1c452ba702442655b6e6':
  Camera2 Legacy: Set a default thumbnail size
 2014-10-01 15:02:29 +00:00
Adam Powell
c754382ba0 am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev 
* commit 'fe426d061ad5feb65200c2970bf826b10e356247':
  Inset the non-overlay contextual action bar without a status guard
 2014-10-01 15:01:37 +00:00
Alan Viverette
8c14ff5cb1 am c44c77d3: Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev 
* commit 'c44c77d305c02d9c8280df5ce3a816ee586c9d52':
  Implement missing visibility management for FrameLayout foreground
 2014-10-01 15:01:31 +00:00