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

153989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Selim Cinek
1c061d4862 am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev 
* commit 'cdbda3e989c640aade8c9164b12b51f452792c29':
  Adapting translation length for a string in a dialog
 2014-10-01 17:20:37 +00:00
Baligh Uddin
f7ade46cc5 am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7249a8bba9fed353c18c94fbe44cf24fba024620':
  Import translations. DO NOT MERGE
 2014-10-01 17:20:34 +00:00
John Spurlock
394f29e761 am cd98a559: am c909e1b2: Zen: Fix new event category check. 
* commit 'cd98a55956a251aad1cafb8c55d2e683037b8b97':
  Zen: Fix new event category check.
 2014-10-01 17:20:30 +00:00
Baligh Uddin
b8cbdcb6f6 am 4aa820ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '4aa820ce58eca124b36d8684b2d01e086786b855':
  Import translations. DO NOT MERGE
 2014-10-01 17:20:26 +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
Selim Cinek
cdbda3e989 am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev 
* commit '15b2202bacdfcc249d7f51bcd3361e6694d24267':
  Adapting translation length for a string in a dialog
 2014-10-01 16:57:09 +00:00
Baligh Uddin
7249a8bba9 am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'ff99ff98cc1ab526c585992b8d1b48128677b192':
  Import translations. DO NOT MERGE
 2014-10-01 16:56:05 +00:00
John Spurlock
cd98a55956 am c909e1b2: Zen: Fix new event category check. 
* commit 'c909e1b2dfa2e47b786d96818f70f6308c5a78be':
  Zen: Fix new event category check.
 2014-10-01 16:56:02 +00:00
Selim Cinek
15b2202bac Merge "Adapting translation length for a string in a dialog" into lmp-dev 2014-10-01 16:43:07 +00:00
Baligh Uddin
4aa820ce58 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-01 16:35:19 +00:00
Baligh Uddin
e575c819e5 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-01 16:35:15 +00:00
Baligh Uddin
ff99ff98cc Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-01 16:35:13 +00:00
John Spurlock
c909e1b2df Zen: Fix new event category check. 
Allow events through if configured, and use a switch
for separating mode-specific logic.

Bug:17580878
Change-Id: Id7b5d8b50173015d6a78568ed0a90e0bccf98549
 2014-10-01 11:17:43 -04: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
Baligh Uddin
576e845032 am eb1618cf: (-s ours) am 42d0c353: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'eb1618cf4b4d55d332ab76afb2c0ab1397495a5a':
  Import translations. DO NOT MERGE
 2014-10-01 15:16:31 +00:00
Brian Carlstrom
c9e46543e7 am ae214fac: am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit 'ae214fac0fa3887c41b1b16a0016a4e6f5b127b1':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 15:16:27 +00:00
Ricardo Cervera
d7b45dd7b0 am 3cf53caf: am 1ed09f9b: am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit '3cf53caf5e06d072a2a82dd4f8def9e0ab74c9d9':
  docs: ADT beginner text fix
 2014-10-01 15:16:23 +00:00
Jeff Brown
f0245cb2e3 am 69073040: am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev 
* commit '6907304024f1c31d2d2dcf783588a6dd8865ecd8':
  Reduce latency from doze to screen on.
 2014-10-01 15:16:19 +00:00
Sungsoo Lim
d5504e04f5 am e4495131: am ee33c661: Merge "Update java doc for content rating systems" into lmp-dev 
* commit 'e4495131cb0b176451d8b422e357c4bd28d8860c':
  Update java doc for content rating systems
 2014-10-01 15:16:16 +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
Dianne Hackborn
d0ab6d6dbf am 88998f79: am 62321ab1: Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 
* commit '88998f79f1344650bc3ebf704600b03bfde2619f':
  Maybe fix issue #17700474: manta: high occurrence of device booted...
 2014-10-01 15:16:09 +00:00
Amit Mahajan
c9ab6f1288 am f9a67cf9: am 496aeb1a: Merge "Roaming blacklist" into lmp-dev 
* commit 'f9a67cf9beb635befa6a2063ef635ca9c5a10e29':
  Roaming blacklist
 2014-10-01 15:16:06 +00:00
Adam Lesinski
95731abeae am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 
* commit 'bb7b51978eb5341e9a1204a447c8340bfb248504':
  Fix issue with using locally defined attrs in a shared lib
 2014-10-01 15:16:02 +00:00
Alan Viverette
5c35f2a47e am e5bed12b: am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev 
* commit 'e5bed12bc2c1fede6b7f2db22d4432f4473c3232':
  Add activated text colors, update Material preference header
 2014-10-01 15:15:58 +00:00
Alan Viverette
cf2b684f97 am d292220f: am 191807e3: Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev 
* commit 'd292220f460400b7c9b6549a39578c87317b6daf':
  Remove baked-in shadow insets from Material dialog minHeight
 2014-10-01 15:15:54 +00:00
Vineeta Srivastava
3cc41b8edd am 533c9461: am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev 
* commit '533c9461569c171fbdfe51cff708c27c10302353':
  Show one name if both plmn and spn are equal
 2014-10-01 15:15:51 +00:00
Vineeta Srivastava
f5e527039b am 0d4d8b19: am 575bf7e6: Merge "Correct MTU size for Bell" into lmp-dev 
* commit '0d4d8b19c0600b3dcfece194c5ae6c0a9d882fdc':
  Correct MTU size for Bell
 2014-10-01 15:15:47 +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
Svetoslav
9d70575903 am 6cda1b3f: am 6b491b64: Merge "Invalid accessibility state if UI test process crashes in a bad time." into lmp-dev 
* commit '6cda1b3fd20443e2114910ed04fa4b53449ae4f3':
  Invalid accessibility state if UI test process crashes in a bad time.
 2014-10-01 15:15:40 +00:00
Winson Chung
57583c33ec am d164460e: am 86ef70eb: Fixing build (Bug 17381033) 
* commit 'd164460e692762226560af77b6b360ae83335b8f':
  Fixing build (Bug 17381033)
 2014-10-01 15:15:36 +00:00
Winson Chung
806a25a515 am 53c7483d: am c12f5745: Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev 
* commit '53c7483dd9545ddd395af2486f94eb93fea0a81a':
  Fixing an issue with leaking starting windows. (Bug 17657878)
 2014-10-01 15:15:32 +00:00
Craig Mautner
c139a41ce7 am d6770a0c: am 4fb4163f: Merge "Call Surface.release() for starting windows" into lmp-dev 
* commit 'd6770a0cab31dec87c12d5d8cfaaad96d65ed828':
  Call Surface.release() for starting windows
 2014-10-01 15:15:28 +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
ztenghui
c430692305 am 9e6a02b9: am ffa16f94: Merge "Correct the documentation for VectorDrawable" into lmp-dev 
* commit '9e6a02b9ae1120001437b64a22cefafe625685f4':
  Correct the documentation for VectorDrawable
 2014-10-01 15:15:18 +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
Jeff Sharkey
3de5ed51d6 am 7bd4aba1: am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev 
* commit '7bd4aba1a81538897fc173a824b6e8eec568f945':
  Clear ident when obtaining provider across users.
 2014-10-01 15:15:10 +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
Fabrice Di Meglio
db963b1c5d am e353ccbf: am 415393f4: Merge "Update for bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit 'e353ccbf532139cf4e83969e5fcbc81489fd21a2':
  Update for bug #17521147 Settings activity looks terrible on Volantis
 2014-10-01 15:14:59 +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
Paul Jensen
18434fcc99 am a524b0f7: am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit 'a524b0f7869c7dc9b5687721883acfd9a535e440':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 15:14:45 +00:00
Alexandra Gherghina
a266670adf am d7275ae2: am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev 
* commit 'd7275ae2c2e2ed8663b05d0560097c45d3e86019':
  Adds the ability to start a user in background
 2014-10-01 15:14:41 +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
Winson Chung
3175f7d245 am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit '2396f135678e8a40b963904e8a6710bc6a204180':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 15:14:34 +00:00