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

153391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
c6a06d437c Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 2014-10-01 18:31:56 +00:00
Hui Shu
aee5c9e7c1 Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 2014-10-01 18:28:57 +00:00
Kenny Guy
a37d000c2b SettingsProvider should use correct cache when redirecting to user 0. 
SettingsProvider reads secure and system settings for managed
profiles from user 0 instead. However it still checks the cache
for the managed profile not user 0.

Bug: 17736586
Change-Id: I15d44b8a5779b01e6b9032e528dc34f5c5602449
 2014-10-01 19:18:18 +01:00
Adam Powell
908c748096 Revert "Fix issue with using locally defined attrs in a shared lib" 
This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.

The reverted commit caused issues loading resources supplied by static libraries.

Bug 17748356

Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
 2014-10-01 18:11:18 +00:00
kmccormick
af0dca00c2 am 04e50c47: am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit '04e50c474ce5b6aa2e366bc057a29a16467a66bd':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 18:02:36 +00:00
Justin Koh
bf6f081cda am 37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev 
* commit '37185d90a2036ece55991f416fcf7948a2198d97':
  DO NOT MERGE Hide the volume panel for watches for now
 2014-10-01 18:00:45 +00:00
Justin Koh
37185d90a2 Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev 2014-10-01 17:58:01 +00:00
Ihab Awad
ead63f0200 am 24199873: Merge "Refine implementation of GSM conferences (1/3)" into lmp-dev 
* commit '24199873ca3297555909914f92e3cab97169b057':
  Refine implementation of GSM conferences (1/3)
 2014-10-01 17:57:24 +00:00
kmccormick
04e50c474c am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit 'd1ba4c13d0928d10c467bd7fd5992186925e1a5a':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 17:55:43 +00:00
Justin Koh
0beee08646 DO NOT MERGE Hide the volume panel for watches for now 
Hide the volume panel: it's not usable. Need new design in a future release.

Bug: 17753651
Change-Id: I6f7b0683908407b2c1457379cc6641d25adc5c83
 2014-10-01 10:55:40 -07: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
Ihab Awad
24199873ca Merge "Refine implementation of GSM conferences (1/3)" into lmp-dev 2014-10-01 17:50:49 +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
Winson Chung
9cb5c4e385 Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) 
- Fix regression with launching an affiliated task due to clipping changes (Bug 17755902)
- Tweaking previous changes to home transition
- Disable the debug mode option
 2014-10-01 17:48:05 +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
kmccormick
d1ba4c13d0 am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit 'ae3bd63bc5ef8106a0d1c2ac15d872517bded5c3':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 17:25:38 +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
kmccormick
ae3bd63bc5 am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit 'a1572ffc6b8df1f0da637fdb93b949322fcb3637':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 17:08:13 +00:00
kmccormick
a1572ffc6b Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 2014-10-01 17:02:26 +00: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
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
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
Baligh Uddin
eb1618cf4b am 42d0c353: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '42d0c353ffbd4aa506025a60806348dd07d4082f':
  Import translations. DO NOT MERGE
 2014-10-01 15:03:43 +00:00
Brian Carlstrom
ae214fac0f am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit '7123bd690fa14d0b9e33f5a70c58ea5b5f1b7d32':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 15:03:39 +00:00
Ricardo Cervera
3cf53caf5e am 1ed09f9b: am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit '1ed09f9b5bd7073f1a574499461dfbd47669da09':
  docs: ADT beginner text fix
 2014-10-01 15:03:31 +00:00
Jeff Brown
6907304024 am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev 
* commit '62434d6a4b4b5aa7d44aa4344b5cb0f82df2b923':
  Reduce latency from doze to screen on.
 2014-10-01 15:03:24 +00:00
Sungsoo Lim
e4495131cb am ee33c661: Merge "Update java doc for content rating systems" into lmp-dev 
* commit 'ee33c661ef7055213a8e3d6d02240aab77a82756':
  Update java doc for content rating systems
 2014-10-01 15:03:14 +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
Dianne Hackborn
88998f79f1 am 62321ab1: Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 
* commit '62321ab11460fd852449b3f6a2113694e3e04e7a':
  Maybe fix issue #17700474: manta: high occurrence of device booted...
 2014-10-01 15:03:02 +00:00
Amit Mahajan
f9a67cf9be am 496aeb1a: Merge "Roaming blacklist" into lmp-dev 
* commit '496aeb1a6156f3c089135a7ce4fab550589eaff7':
  Roaming blacklist
 2014-10-01 15:02:56 +00:00
Adam Lesinski
bb7b51978e am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 
* commit 'cd8e73817d14798f9d2031ffd301a03a096b7907':
  Fix issue with using locally defined attrs in a shared lib
 2014-10-01 15:02:52 +00:00
Alan Viverette
e5bed12bc2 am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev 
* commit 'c2379e005d3e692d0b725c65fa842459e65ad1dc':
  Add activated text colors, update Material preference header
 2014-10-01 15:02:49 +00:00
Alan Viverette
d292220f46 am 191807e3: Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev 
* commit '191807e3863d873cd315701ab7f32b0b51e1bf35':
  Remove baked-in shadow insets from Material dialog minHeight
 2014-10-01 15:02:45 +00:00
Vineeta Srivastava
533c946156 am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev 
* commit 'ab1e241d385ac2cb589f961cf6ea4a86b8a3e867':
  Show one name if both plmn and spn are equal
 2014-10-01 15:02:37 +00:00
Vineeta Srivastava
0d4d8b19c0 am 575bf7e6: Merge "Correct MTU size for Bell" into lmp-dev 
* commit '575bf7e6ccd3555e2f7e7b90f061867fa1a39934':
  Correct MTU size for Bell
 2014-10-01 15:02:32 +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
Svetoslav
6cda1b3fd2 am 6b491b64: Merge "Invalid accessibility state if UI test process crashes in a bad time." into lmp-dev 
* commit '6b491b64ba7200a85199452b6a7f99c777105f22':
  Invalid accessibility state if UI test process crashes in a bad time.
 2014-10-01 15:02:24 +00:00
Winson Chung
d164460e69 am 86ef70eb: Fixing build (Bug 17381033) 
* commit '86ef70eb08b83fc41d0c8e124315d9ee9fea0ee4':
  Fixing build (Bug 17381033)
 2014-10-01 15:02:18 +00:00
Winson Chung
53c7483dd9 am c12f5745: Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev 
* commit 'c12f57457411e67adf2c8acaad21b08c934e583b':
  Fixing an issue with leaking starting windows. (Bug 17657878)
 2014-10-01 15:02:01 +00:00
Craig Mautner
d6770a0cab am 4fb4163f: Merge "Call Surface.release() for starting windows" into lmp-dev 
* commit '4fb4163f4c6f49eebc34d1b193c526558af0d375':
  Call Surface.release() for starting windows
 2014-10-01 15:01:57 +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
ztenghui
9e6a02b9ae am ffa16f94: Merge "Correct the documentation for VectorDrawable" into lmp-dev 
* commit 'ffa16f944882f2e27109af8fe4b7272322f9cb84':
  Correct the documentation for VectorDrawable
 2014-10-01 15:01:28 +00:00
Ruben Brunk
7432b88447 am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev 
* commit 'b3c802f2381c3411fe753206ab89027f60164b77':
  camera2: Use valid dimensions for RGBA8888 gralloc buffers.
 2014-10-01 15:01:24 +00:00
Jeff Sharkey
7bd4aba1a8 am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev 
* commit 'b27d43a8805769f9a9dfdc024b5cd19b71cfd8d7':
  Clear ident when obtaining provider across users.
 2014-10-01 15:01:05 +00:00