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

160898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Winson Chung
be1b7ddb44 am ac5bb347: am 3175f7d2: am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit 'ac5bb347cb769f217135124ddb6008bab9727d22':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 17:09:22 +00:00
John Spurlock
f35be105ee am 9a4fc6aa: am eac6926f: am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit '9a4fc6aab9884af87d49e0d912da56dd8bfe8868':
  Don't play hint animations when dozing
 2014-10-01 17:09:18 +00:00
Jason Monk
e9250ae94f am 81ab90f2: am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '81ab90f2173c8afac82a22c2cca72eb90293de9a':
  Pull roaming from mServiceState for consistency
 2014-10-01 17:09:13 +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
John Spurlock
c4b4ffb808 am abc4db31: am 3fd4440f: am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'abc4db312aa6e5287b5abbd2d201f10d642fca7d':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 17:09:05 +00:00
Baligh Uddin
66e622ba6a am f13bb6f5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'f13bb6f53ca5a86ba7822dd1735adb417bfaf34e':
  Import translations. DO NOT MERGE
 2014-10-01 17:04:00 +00:00
Dianne Hackborn
e83f322fa9 am 30854356: am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit '30854356ef263a4e4ac3bd2376886f272d768e72':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 17:00:18 +00:00
Winson Chung
ac5bb347cb am 3175f7d2: am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit '3175f7d245daba660852cbcb92a7a821899b70a3':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 17:00:14 +00:00
John Spurlock
9a4fc6aab9 am eac6926f: am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit 'eac6926f0cb260339ec7ec2495964331249338e2':
  Don't play hint animations when dozing
 2014-10-01 17:00:10 +00:00
Jason Monk
81ab90f217 am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '9e280c447f5f8747f7c4777d80d5dd7c25e7713e':
  Pull roaming from mServiceState for consistency
 2014-10-01 17:00:05 +00:00
George Mount
8cc881257c am 6d7a0cd5: am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '6d7a0cd57f75e3b88a7f8a0f74694c8c049784c3':
  Clear preordered list after use.
 2014-10-01 16:59:48 +00:00
John Spurlock
abc4db312a am 3fd4440f: am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit '3fd4440fea2d29f423a99cfaa5e30f4ff5c2239d':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 16:59:44 +00:00
Baligh Uddin
f13bb6f53c Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-01 16:35:21 +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
John Spurlock
eac6926f0c am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit '260e6d542ff05094063f1a1574f41fa165308eef':
  Don't play hint animations when dozing
 2014-10-01 15:14:30 +00:00
Jason Monk
9e280c447f am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '15349991240bb9443d704b4ac85915f474e5108c':
  Pull roaming from mServiceState for consistency
 2014-10-01 15:14:26 +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
John Spurlock
3fd4440fea am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'af41d8477a8152c0597630066207a863ad74614e':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 15:14:18 +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
Baligh Uddin
3a25e36cd5 am a88cbd6c: (-s ours) am 3e9bf6c6: (-s ours) am 3022aa21: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'a88cbd6c496b60649e398b1eb326abd419fce601':
  Import translations. DO NOT MERGE
 2014-10-01 05:41:55 +00:00
Baligh Uddin
c991f5030d am d73a85f3: (-s ours) am 2e459a66: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd73a85f36ef1a16ccfa56baf6925586faf2d4ee6':
  Import translations. DO NOT MERGE
 2014-10-01 05:36:35 +00:00
Baligh Uddin
a88cbd6c49 am 3e9bf6c6: (-s ours) am 3022aa21: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '3e9bf6c69330d3e9b0f3d9424814b307532a64e9':
  Import translations. DO NOT MERGE
 2014-10-01 05:35:57 +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
7b8d760829 am 3bc8a117: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '3bc8a11745d82106aa3fb38ecba0d0b579339513':
  Import translations. DO NOT MERGE
 2014-10-01 05:31:06 +00:00
Baligh Uddin
d73a85f36e am 2e459a66: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '2e459a6653f6254153005352a6fec812ce48f18d':
  Import translations. DO NOT MERGE
 2014-10-01 05:30:40 +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
3bc8a11745 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-01 04:25:37 +00:00
Baligh Uddin
3022aa2175 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-01 04:25:35 +00:00
Matthew Williams
c926b2f175 am 99771e9e: am 9a957e09: am d55d3c59: am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 
* commit '99771e9ea7e68eb8a7578361d5ee24a037dc382d':
  Fix deadlock caused by clearAllBackoffs in SSE
 2014-10-01 01:43:15 +00:00
Lorenzo Colitti
505315d6c6 am 2f82b128: am 5e7f08f5: am 6c1d0e07: am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 
* commit '2f82b128afd3b5540097ee88ec3df86a31938f3c':
  Update LegacyTypeTracker state before sending connect broadcasts.
 2014-10-01 01:43:11 +00:00
Scott Rowe
d6a5fc2508 am 033cbc2f: am a0bdf9cc: am 8cfba205: am d1462247: am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '033cbc2fa420d25cb1b4bbf83e03b312d1ef18b4':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-10-01 01:43:06 +00:00
Ricardo Cervera
97cbbe6a6e am 4cb399fd: am ba32c278: am d4a2da04: am 3910b5d2: am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit '4cb399fd51adfb55d12725f58309fd2172ccdf0e':
  docs: Fixed path for build output.
 2014-10-01 01:43:02 +00:00
Justin Koh
fb78a6fe98 am 43589647: am 870ba83b: am 8dd8818b: am 91bd8769: am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev 
* commit '43589647ab13b61deb3424f40219338cf32097b8':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
 2014-10-01 01:42:58 +00:00
Alan Viverette
708993dac8 am e77db227: am a1411fe0: am 52208590: am 76e15c4b: Merge "Decrease date picker height to avoid cutting off calendar" into lmp-dev 
* commit 'e77db227c718786c208a7c327bc08ca4cf313f83':
  Decrease date picker height to avoid cutting off calendar
 2014-10-01 01:42:50 +00:00
Alan Viverette
32eb1a52b3 am 6a26bf14: am eca52d91: am 35ebdd05: am b805da9b: Merge "Fix drawable container tinting" into lmp-dev 
* commit '6a26bf14a9eed00ca4835c0b2cd3b1d89686db89':
  Fix drawable container tinting
 2014-10-01 01:42:46 +00:00
Jean-Michel Trivi
40a47f6dd7 am 4b495477: am 9f1bca5f: am 0ed179d1: am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev 
* commit '4b495477d957cef0b0e199674d63b6147a3c4e58':
  Send volume keys to the default stream if not actually playing
 2014-10-01 01:42:42 +00:00
Dianne Hackborn
f9cd6fa5a3 am bb527c59: am e26ba8f7: am 069de204: am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'bb527c59d1fb0ad627f44cbb378959fa7d4af2c7':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 01:42:37 +00:00
Chris Craik
e5cc77e7e1 am e9d3c6ff: am d7de7b49: am 505c9d2c: am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev 
* commit 'e9d3c6ffa3aa5e175226c2b172c726204f4f1dce':
  Implement alpha as documented for drawables
 2014-10-01 01:42:33 +00:00
Fabrice Di Meglio
2e03f69807 am 40fa442c: am b90269b0: am b08fc7ec: am df61d004: Fix bug #17682629 Crash while accessing apps\' settings 
* commit '40fa442c798be8a8e8ab0f1d4df5145c914b2d34':
  Fix bug #17682629 Crash while accessing apps' settings
 2014-10-01 01:42:29 +00:00
Chris Craik
edb3ebfd3f am bb5f8f5c: am 08897806: Merge "Add tracing for saveLayer" into lmp-mr1-dev 
* commit 'bb5f8f5c94610f8eb23a6f74c3f0a5a7dd402606':
  Add tracing for saveLayer
 2014-10-01 01:42:24 +00:00
Matthew Williams
99771e9ea7 am 9a957e09: am d55d3c59: am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 
* commit '9a957e090427077240e5707d51a3cbad52b4717b':
  Fix deadlock caused by clearAllBackoffs in SSE
 2014-10-01 01:19:42 +00:00
Lorenzo Colitti
2f82b128af am 5e7f08f5: am 6c1d0e07: am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 
* commit '5e7f08f5132df3eec1556b06f2ad8a14937d78d5':
  Update LegacyTypeTracker state before sending connect broadcasts.
 2014-10-01 01:19:38 +00:00
Scott Rowe
033cbc2fa4 am a0bdf9cc: am 8cfba205: am d1462247: am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit 'a0bdf9cce7ab85b2c33b684665726c59d112e1b8':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-10-01 01:19:34 +00:00