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

154140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dianne Hackborn
962e3e8315 am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '9cf01b63cb0023aec0e05b1ce050ff572532b876':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 15:00:49 +00:00
Svetoslav
567c97881b am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit '44d4eeaa48721296663a05d01071f196a509dc34':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 15:00:44 +00:00
Fabrice Di Meglio
e353ccbf53 am 415393f4: Merge "Update for bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '415393f424c8df75194aa194c46acfb213866c08':
  Update for bug #17521147 Settings activity looks terrible on Volantis
 2014-10-01 15:00:33 +00:00
Winson Chung
b61dea2047 am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 
* commit 'da649073bd927fa69d02982745cc1d61e9a4f8b3':
  Fixing regression with black task bar background. (Bug 17584337)
 2014-10-01 15:00:17 +00:00
Chris Wren
b742c9a012 am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit 'c3328cacdad67623f94b13fceb734d958461a475':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 14:59:59 +00:00
Chris Wren
4afe428f49 am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit 'af098c5657942d645ec7362cc439718457abec64':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 14:59:55 +00:00
Paul Jensen
a524b0f786 am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit '8df099df1516d23c113be3121635dcd34984a4a0':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 14:59:47 +00:00
Alexandra Gherghina
d7275ae2c2 am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev 
* commit '75c33d9d04d8c0a9884a70077681261b57c7833c':
  Adds the ability to start a user in background
 2014-10-01 14:59:23 +00:00
Dianne Hackborn
29a1152358 am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit 'c3014c8cf8932cb6a482e985edc7def97c50eede':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 14:59:18 +00:00
Winson Chung
2396f13567 am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit 'e3206407a5968dcf6690793f047bdfede0424df5':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 14:59:12 +00:00
John Spurlock
260e6d542f am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit 'a1b84165f9520c025c59f5b2d93a65d4609b8088':
  Don't play hint animations when dozing
 2014-10-01 14:59:07 +00:00
Jason Monk
1534999124 am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit 'e7b18d2bab30ca257b63e9029c6e08b9700b89a6':
  Pull roaming from mServiceState for consistency
 2014-10-01 14:58:57 +00:00
George Mount
3dc0a91874 am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '8afceda14176b911cf755b8ebbcfbfa9eff60aae':
  Clear preordered list after use.
 2014-10-01 14:58:53 +00:00
John Spurlock
af41d8477a am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'ee98df79a1797323aaa6d645e9cd5dc6a7cc0ee4':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 14:58:45 +00:00
Selim Cinek
1aca1d4110 Adapting translation length for a string in a dialog 
Bug: 17344905
Change-Id: Id95bdfea30c8ffd86a44cfa259cf5417abb09528
 2014-10-01 14:12:11 +02:00
Narayan Kamath
7dc7f676d6 Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 2014-10-01 09:53:34 +00:00
Baligh Uddin
3e9bf6c693 am 3022aa21: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '3022aa2175e82cc67c51a70748ea6923876e9806':
  Import translations. DO NOT MERGE
 2014-10-01 05:31:30 +00:00
Baligh Uddin
42d0c353ff Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-01 04:25:43 +00:00
Baligh Uddin
2e459a6653 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-01 04:25:39 +00:00
Baligh Uddin
3022aa2175 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-01 04:25:35 +00:00
Brian Carlstrom
7123bd690f Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 2014-10-01 04:21:26 +00:00
Ricardo Cervera
1ed09f9b5b am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit 'e906b38b7e692d05cf57ce12aabcb103a9a8b775':
  docs: ADT beginner text fix
 2014-10-01 03:15:45 +00:00
Ricardo Cervera
e906b38b7e am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit '781c988a767eabf9b1b03b4a74f21e3b687902b6':
  docs: ADT beginner text fix
 2014-10-01 03:08:30 +00:00
Ricardo Cervera
781c988a76 am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit 'ae7b5dc49381e76c82cda928cc37a6a8b529da25':
  docs: ADT beginner text fix
 2014-10-01 02:57:29 +00:00
Jeff Brown
62434d6a4b Merge "Reduce latency from doze to screen on." into lmp-dev 2014-10-01 02:31:30 +00:00
Ricardo Cervera
ae7b5dc493 Merge "docs: ADT beginner text fix" into klp-modular-docs 2014-10-01 02:07:15 +00:00
Sungsoo Lim
ee33c661ef Merge "Update java doc for content rating systems" into lmp-dev 2014-10-01 01:46:26 +00:00
Jerome Poichet
72079f7f9b Merge "Make sure cancel is called on tear down." into lmp-dev 2014-10-01 01:22:42 +00:00