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

163334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
ed9b1a848d Import translations. DO NOT MERGE 
Change-Id: Ieb412ac9804570a48077a9cf8f425d7fe306016e
Auto-generated-cl: translation import
 2014-09-20 13:00:56 -07:00
Baligh Uddin
0e474c898c Import translations. DO NOT MERGE 
Change-Id: I73abf0516cb01fe6c6ae9a0b01fa805b26818c76
Auto-generated-cl: translation import
 2014-09-20 12:58:39 -07:00
Baligh Uddin
39df7209b1 Import translations. DO NOT MERGE 
Change-Id: I11cded1dd334b8088faa24a66c66341fe0e0f38d
Auto-generated-cl: translation import
 2014-09-20 12:57:53 -07:00
Nick Kralevich
4986a3875f resolved conflicts for merge of 4cbee7d2 to lmp-mr1-dev-plus-aosp 
Change-Id: Ibed2d1ef98e13b7d50781020502665620ab15659
 2014-09-20 11:15:50 -07:00
Christopher Ferris
27c5da9594 am 9dce5bd2: am 7d113829: am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references." 
* commit '9dce5bd2c6e738d183fd514914684098d4ac2093':
  Remove MALLOC_LEAK_CHECK references.
 2014-09-20 03:20:08 +00:00
Yigit Boyar
1d8a32da72 am 4a1d6875: am 1ea86977: am 6477ca14: am 397c6004: am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev 
* commit '4a1d68759a4a4ec1df3f77d0f83663d8372ce89f':
  Find activity from context in menu inflator for click events
 2014-09-20 02:59:39 +00:00
Jeff Brown
37b95162f3 am 86fdd3cf: am 77e786ab: am 978272f4: am a94c9ccb: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev 
* commit '86fdd3cfebf2e4dee1b5244246604f1eb3eb6c03':
  Decouple turning screen on from waking up in policy.
 2014-09-20 02:59:33 +00:00
Jeff Brown
303aa16876 am 64df7966: am 39a150b7: am 6adfcedc: am f138c63e: am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 
* commit '64df79668385e2107178f4740346ab50d72f0c11':
  Fix order of operations while pulsing the ambient display.
 2014-09-20 02:59:29 +00:00
Jeff Brown
9654aef21a am 3431af0d: am f11b919a: am 2da2e364: am 5737f7d7: am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 
* commit '3431af0db909b0211793bb3a626abab4704d015b':
  Ensure that the screen on blocker is applied while dozing.
 2014-09-20 02:59:24 +00:00
Christopher Ferris
172fa08e95 am 7d113829: am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references." 
* commit '7d1138298b37bca2340fc4610090b53f5b838f7a':
  Remove MALLOC_LEAK_CHECK references.
 2014-09-20 02:56:48 +00:00
Yigit Boyar
cb0721ff8f am 1ea86977: am 6477ca14: am 397c6004: am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev 
* commit '1ea86977bf9d9106728c5344ee1e5f054b8973e5':
  Find activity from context in menu inflator for click events
 2014-09-20 02:44:20 +00:00
Jeff Brown
4df057c98b am 77e786ab: am 978272f4: am a94c9ccb: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev 
* commit '77e786abd5f2dcb74de3cc083c1cc64c884fac9d':
  Decouple turning screen on from waking up in policy.
 2014-09-20 02:44:14 +00:00
Jeff Brown
a9c0b9ba3f am 39a150b7: am 6adfcedc: am f138c63e: am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 
* commit '39a150b73b61fbc30bfcce854539cc3670809457':
  Fix order of operations while pulsing the ambient display.
 2014-09-20 02:44:08 +00:00
Jeff Brown
6e58cb47fe am f11b919a: am 2da2e364: am 5737f7d7: am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 
* commit 'f11b919a8e9ced3bd8eca4743a14e4bf18c451f3':
  Ensure that the screen on blocker is applied while dozing.
 2014-09-20 02:44:00 +00:00
Yigit Boyar
27b767134b am 6477ca14: am 397c6004: am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev 
* commit '6477ca149262e630ac1f2426dc6d9dca2ab279db':
  Find activity from context in menu inflator for click events
 2014-09-20 02:24:22 +00:00
Jeff Brown
bdd4e4af79 am 978272f4: am a94c9ccb: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev 
* commit '978272f46f6bce0ef6557dffe770825122a70d86':
  Decouple turning screen on from waking up in policy.
 2014-09-20 02:24:18 +00:00
Jeff Brown
4c575967f2 am 6adfcedc: am f138c63e: am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 
* commit '6adfcedc5483bfb2fcaec29d6cc9694bc723bd32':
  Fix order of operations while pulsing the ambient display.
 2014-09-20 02:24:13 +00:00
Jeff Brown
fb92f2cb16 am 2da2e364: am 5737f7d7: am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 
* commit '2da2e364efbefaccf33639e6be06194eb9be5fd3':
  Ensure that the screen on blocker is applied while dozing.
 2014-09-20 02:24:09 +00:00
Christopher Tate
46380962f3 am 1f2e31ef: am 1c1ffb64: am 4cd2c811: am ebff637b: am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev 
* commit '1f2e31efb8ce78f99c86f7847b7498e23937d2ff':
  Always give wifi a chance to quiet down during restore
 2014-09-20 02:17:32 +00:00
Dianne Hackborn
09a5285130 am 2412cca0: am 0eec7efe: am 423a1069: am cec64f46: am da7e72b1: Merge "Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different..." into lmp-dev 
* commit '2412cca04b4bb331aa0f95bd8e1454203befe8c2':
  Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different...
 2014-09-20 02:17:28 +00:00
Yigit Boyar
31ff5b9fd3 am 397c6004: am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev 
* commit '397c6004706f93941514d31c2cafdbd6183634fd':
  Find activity from context in menu inflator for click events
 2014-09-20 02:05:07 +00:00
Jeff Brown
de7c9b964f am a94c9ccb: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev 
* commit 'a94c9ccb8a7f85ff2a3e1329e94367c863f39309':
  Decouple turning screen on from waking up in policy.
 2014-09-20 02:05:03 +00:00
Jeff Brown
4ed1dbcf0b am f138c63e: am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 
* commit 'f138c63e799090b7e796b577ce9926753c7b77c8':
  Fix order of operations while pulsing the ambient display.
 2014-09-20 02:04:59 +00:00
Jeff Brown
00a3441b25 am 5737f7d7: am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 
* commit '5737f7d75c34b2cb7c66771d3cda21a019acd2d2':
  Ensure that the screen on blocker is applied while dozing.
 2014-09-20 02:04:55 +00:00
Christopher Tate
a3d0f3f44a am 1c1ffb64: am 4cd2c811: am ebff637b: am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev 
* commit '1c1ffb64c1a9fa2a173cba112a27daf4262c63a2':
  Always give wifi a chance to quiet down during restore
 2014-09-20 01:54:05 +00:00
Dianne Hackborn
ae6865522e am 0eec7efe: am 423a1069: am cec64f46: am da7e72b1: Merge "Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different..." into lmp-dev 
* commit '0eec7efe935d3eeb9d5fe52eb5c7cf0ca2463b49':
  Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different...
 2014-09-20 01:53:58 +00:00
Yigit Boyar
0f46dd0de9 am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev 
* commit '646e0428a489d786c29a9ad48c1f21f3d644af42':
  Find activity from context in menu inflator for click events
 2014-09-20 01:36:12 +00:00
Christopher Ferris
4cbee7d24d am b7442bbc: Merge "Remove MALLOC_LEAK_CHECK references." 
* commit 'b7442bbc8c27b0643b7235076ee151b8257bf28d':
  Remove MALLOC_LEAK_CHECK references.
 2014-09-20 01:30:36 +00:00
Yigit Boyar
1a74dc4547 Merge "Find activity from context in menu inflator for click events" into lmp-dev 2014-09-20 01:30:00 +00:00
Jeff Brown
e8e3125eeb am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev 
* commit '09395677f7ef5119556e8ba100c0bd27480c9797':
  Decouple turning screen on from waking up in policy.
 2014-09-20 01:27:03 +00:00
Jeff Brown
76eb0a5b79 am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 
* commit '6d098d406305bb6f34d48ce6035ba3920659a805':
  Fix order of operations while pulsing the ambient display.
 2014-09-20 01:26:59 +00:00
Jeff Brown
044af2d4f5 am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 
* commit 'f10fc92c564048b51f1775fe92738669d358fa16':
  Ensure that the screen on blocker is applied while dozing.
 2014-09-20 01:26:54 +00:00
Christopher Ferris
b7442bbc8c Merge "Remove MALLOC_LEAK_CHECK references." 2014-09-20 01:23:27 +00:00
Jeff Brown
6e53b7476e Merge "Decouple turning screen on from waking up in policy." into lmp-dev 2014-09-20 01:09:40 +00:00
Jeff Brown
7858a1b5d8 Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 2014-09-20 01:09:10 +00:00
Jeff Brown
1ecada8582 Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 2014-09-20 01:08:52 +00:00
Christopher Ferris
9244436a05 Remove MALLOC_LEAK_CHECK references. 
Bug: 17378595
Change-Id: Ie7f8af88c7f3b0c3dc2c2e75bbaaa9e6a81269ae
 2014-09-19 18:08:29 -07:00
Svetoslav
fb73454887 am 9900a843: am c6570bca: am a5fe65ad: am 86636aa3: am e87d1f7a: Merge "TouchExploer computes incorectly the click location." into lmp-dev 
* commit '9900a843a7b8ed589ee542825482c554c8283ad0':
  TouchExploer computes incorectly the click location.
 2014-09-20 01:03:57 +00:00
Christopher Tate
396cc75319 am 4cd2c811: am ebff637b: am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev 
* commit '4cd2c8117174d0692b79f8346706f193d7242c3d':
  Always give wifi a chance to quiet down during restore
 2014-09-20 00:55:45 +00:00
Dianne Hackborn
44fecb0b76 am 423a1069: am cec64f46: am da7e72b1: Merge "Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different..." into lmp-dev 
* commit '423a1069bd0dba4e74d412a0f30aeff1fee8eca5':
  Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different...
 2014-09-20 00:55:41 +00:00
Svetoslav
dbe48d33fb am c6570bca: am a5fe65ad: am 86636aa3: am e87d1f7a: Merge "TouchExploer computes incorectly the click location." into lmp-dev 
* commit 'c6570bca53f291bf897c6b0a5c691fc642438fc2':
  TouchExploer computes incorectly the click location.
 2014-09-20 00:50:11 +00:00
Christopher Ferris
7d1138298b am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references." 
* commit 'b6f891c42ffdfdd9adc3811adaf09e09e3db7e84':
  Remove MALLOC_LEAK_CHECK references.
 2014-09-20 00:49:35 +00:00
Christopher Tate
688c88e0d2 am ebff637b: am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev 
* commit 'ebff637b894a60a20e62b12089c29779cc6f9e98':
  Always give wifi a chance to quiet down during restore
 2014-09-20 00:45:09 +00:00
Dianne Hackborn
1fe3ed40f1 am cec64f46: am da7e72b1: Merge "Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different..." into lmp-dev 
* commit 'cec64f466c4010dbf97d00a3fc713b36c82bc42c':
  Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different...
 2014-09-20 00:45:00 +00:00
Christopher Ferris
b6f891c42f Merge "Remove MALLOC_LEAK_CHECK references." 2014-09-20 00:42:22 +00:00
Svetoslav
5796d19481 am a5fe65ad: am 86636aa3: am e87d1f7a: Merge "TouchExploer computes incorectly the click location." into lmp-dev 
* commit 'a5fe65adc7de853a6525c4cef47f2084a1231622':
  TouchExploer computes incorectly the click location.
 2014-09-20 00:38:10 +00:00
Christopher Tate
604de34956 am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev 
* commit 'c9a016dd4eefd01ab6acc916d2a1bad854933e58':
  Always give wifi a chance to quiet down during restore
 2014-09-20 00:33:14 +00:00
Dianne Hackborn
89de053753 am da7e72b1: Merge "Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different..." into lmp-dev 
* commit 'da7e72b1c1f43fecc522727f42eb2fa01b6f8df4':
  Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different...
 2014-09-20 00:33:10 +00:00
Chris Craik
57b2d6b4ca am 1ee0dace: am 30dca470: am f0a80b68: am ea74883e: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev 
* commit '1ee0dacea8f6373915c241dba9aaa0e14f732e12':
  Account for alpha in hasShadow()
 2014-09-20 00:30:23 +00:00
Dianne Hackborn
f97d371769 am a7e2d552: am 77817a6b: am 4b091802: am 3ed0079f: am 8a9df5a2: Merge "Fix issue #17574819: Chrome browser process is killed in background..." into lmp-dev 
* commit 'a7e2d552034569679012d9e8a0248ecd06edaa34':
  Fix issue #17574819: Chrome browser process is killed in background...
 2014-09-20 00:30:19 +00:00