Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,868 Commits 3 Branches 0 Tags
c4b4ffb808de03e8efcabd8cd96a192261baec0a
Commit Graph

160868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Ricardo Cervera
4cb399fd51 am ba32c278: am d4a2da04: am 3910b5d2: am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit 'ba32c278da93497184bd35adbd71b7d691042751':
  docs: Fixed path for build output.
 2014-10-01 01:19:31 +00:00
Justin Koh
43589647ab 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 '870ba83b3d197abb62bf65a1cf0f4ebfcb027de1':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
 2014-10-01 01:19:26 +00:00
Alan Viverette
e77db227c7 am a1411fe0: am 52208590: am 76e15c4b: Merge "Decrease date picker height to avoid cutting off calendar" into lmp-dev 
* commit 'a1411fe08f1d65a6cb29f7e71ca259e0aecc399d':
  Decrease date picker height to avoid cutting off calendar
 2014-10-01 01:19:20 +00:00
Alan Viverette
6a26bf14a9 am eca52d91: am 35ebdd05: am b805da9b: Merge "Fix drawable container tinting" into lmp-dev 
* commit 'eca52d9171337ea542b6c3230ef155c766a0c03f':
  Fix drawable container tinting
 2014-10-01 01:19:16 +00:00
Jean-Michel Trivi
4b495477d9 am 9f1bca5f: am 0ed179d1: am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev 
* commit '9f1bca5f21bda6b1118b3556495bf91431ad46b6':
  Send volume keys to the default stream if not actually playing
 2014-10-01 01:19:12 +00:00
Dianne Hackborn
bb527c59d1 am e26ba8f7: am 069de204: am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'e26ba8f74f364079b97c0dcdad3f441f9bb553d4':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 01:19:08 +00:00
Chris Craik
e9d3c6ffa3 am d7de7b49: am 505c9d2c: am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev 
* commit 'd7de7b49b1ff327c642c98ec4bb27762b4cf9035':
  Implement alpha as documented for drawables
 2014-10-01 01:19:04 +00:00
Fabrice Di Meglio
40fa442c79 am b90269b0: am b08fc7ec: am df61d004: Fix bug #17682629 Crash while accessing apps\' settings 
* commit 'b90269b095012e57805865e0a824f771eaad739b':
  Fix bug #17682629 Crash while accessing apps' settings
 2014-10-01 01:19:00 +00:00
Chris Craik
bb5f8f5c94 am 08897806: Merge "Add tracing for saveLayer" into lmp-mr1-dev 
* commit '08897806749dc3c49b93cac5bfde45188f11444f':
  Add tracing for saveLayer
 2014-10-01 01:18:56 +00:00
Matthew Williams
9a957e0904 am d55d3c59: am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 
* commit 'd55d3c597a889ec1ac5b0fc1248a605fc49f5d38':
  Fix deadlock caused by clearAllBackoffs in SSE
 2014-10-01 00:59:20 +00:00
Lorenzo Colitti
5e7f08f513 am 6c1d0e07: am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 
* commit '6c1d0e07840d124921fd30f04ad11b409ea73b3e':
  Update LegacyTypeTracker state before sending connect broadcasts.
 2014-10-01 00:59:16 +00:00
Scott Rowe
a0bdf9cce7 am 8cfba205: am d1462247: am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '8cfba20560314a09d7e9a2fd98355109d30d57cd':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-10-01 00:59:13 +00:00
Ricardo Cervera
ba32c278da am d4a2da04: am 3910b5d2: am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit 'd4a2da0494f4a3d2636f7e61c36373f872039262':
  docs: Fixed path for build output.
 2014-10-01 00:59:09 +00:00
Justin Koh
870ba83b3d 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 '8dd8818bdeb7b264f82da0f0854722ffd7ab7e12':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
 2014-10-01 00:59:06 +00:00
Alan Viverette
a1411fe08f am 52208590: am 76e15c4b: Merge "Decrease date picker height to avoid cutting off calendar" into lmp-dev 
* commit '52208590123210506abd2d14124bec1f07847b1f':
  Decrease date picker height to avoid cutting off calendar
 2014-10-01 00:59:02 +00:00
Alan Viverette
eca52d9171 am 35ebdd05: am b805da9b: Merge "Fix drawable container tinting" into lmp-dev 
* commit '35ebdd0514c7d3e6b2e64acb916f5160821bd463':
  Fix drawable container tinting
 2014-10-01 00:58:59 +00:00
Jean-Michel Trivi
9f1bca5f21 am 0ed179d1: am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev 
* commit '0ed179d185bc976779c6959b4d2d11c19538e60b':
  Send volume keys to the default stream if not actually playing
 2014-10-01 00:58:55 +00:00
Dianne Hackborn
e26ba8f74f am 069de204: am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '069de2045ef1b65f8952e2a452afbfa6bdc3f850':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 00:58:52 +00:00
Chris Craik
d7de7b49b1 am 505c9d2c: am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev 
* commit '505c9d2ce0a8ed8dc27baf406f05f2ae4c265fe5':
  Implement alpha as documented for drawables
 2014-10-01 00:58:48 +00:00
Fabrice Di Meglio
b90269b095 am b08fc7ec: am df61d004: Fix bug #17682629 Crash while accessing apps\' settings 
* commit 'b08fc7ec1b77203d53766a1537239e30fc56890f':
  Fix bug #17682629 Crash while accessing apps' settings
 2014-10-01 00:58:45 +00:00