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
3022aa2175
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-01 04:25:35 +00:00
Matthew Williams
d55d3c597a
am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev
...
* commit 'bc156ba430d286aaab8deb7bbb3bccc655cd2e92':
Fix deadlock caused by clearAllBackoffs in SSE
2014-10-01 00:52:38 +00:00
Lorenzo Colitti
6c1d0e0784
am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
...
* commit 'd8f7e048281559462f9c590f9d7d48fb7fe065ce':
Update LegacyTypeTracker state before sending connect broadcasts.
2014-10-01 00:52:34 +00:00
Scott Rowe
8cfba20560
am d1462247: am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown
...
* commit 'd1462247e05dab10d20372249e9a3ef7ef93fc2e':
docs: b/16044763 Update IAB docs to give notice of v2 turndown
2014-10-01 00:52:07 +00:00
Ricardo Cervera
d4a2da0494
am 3910b5d2: am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
...
* commit '3910b5d2f55b613191610905a4ae25aa3d3a1d15':
docs: Fixed path for build output.
2014-10-01 00:52:04 +00:00
Justin Koh
8dd8818bde
am 91bd8769: am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
...
* commit '91bd87699137a4ec9f4dc249592401005303f945':
DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
2014-10-01 00:52:00 +00:00
Alan Viverette
5220859012
am 76e15c4b: Merge "Decrease date picker height to avoid cutting off calendar" into lmp-dev
...
* commit '76e15c4b3affbca016f6ecc3dbf302db9b64bbe4':
Decrease date picker height to avoid cutting off calendar
2014-10-01 00:51:57 +00:00
Alan Viverette
35ebdd0514
am b805da9b: Merge "Fix drawable container tinting" into lmp-dev
...
* commit 'b805da9b592e67cb777b78db3a96d47c60e31ca7':
Fix drawable container tinting
2014-10-01 00:51:37 +00:00
Jean-Michel Trivi
0ed179d185
am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev
...
* commit '4a154af9aad13c09821ada6187440feaec2d38e8':
Send volume keys to the default stream if not actually playing
2014-10-01 00:51:32 +00:00
Dianne Hackborn
069de2045e
am 38646c19: Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit '38646c19d8badea143113c0dc48ccdacb18badc4':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-10-01 00:51:10 +00:00
Chris Craik
505c9d2ce0
am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev
...
* commit 'e910cc88387f49b119bb2f8e579849864970ac87':
Implement alpha as documented for drawables
2014-10-01 00:50:59 +00:00
Fabrice Di Meglio
b08fc7ec1b
am df61d004: Fix bug #17682629 Crash while accessing apps\' settings
...
* commit 'df61d0046cb901f75d2758aa443190371b4cc746':
Fix bug #17682629 Crash while accessing apps' settings
2014-10-01 00:50:56 +00:00
RoboErik
a65a4f64e6
am 9eef5bf8: Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev
...
* commit '9eef5bf8d1a69879ada3176c839676dc82b14daf':
Be more paranoid about threading in MediaSessionRecord
2014-09-30 16:32:03 +00:00
John Spurlock
ee98df79a1
Doze: Log screenOnFromTouch when flinging.
...
Bug: 17350239
Bug: 17496795
Change-Id: I4a8e26c2fc05cf4396e9c8cb58e81b4f95c531e6
2014-09-30 14:07:23 +00:00
Baligh Uddin
434e3f5692
Import translations. DO NOT MERGE
...
Change-Id: I7312c543254668cb3b572767fe94a3d8736b04f3
Auto-generated-cl: translation import
2014-09-30 01:20:57 -07:00
Matthew Williams
bc156ba430
Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev
2014-09-30 03:09:10 +00:00
Lorenzo Colitti
d8f7e04828
Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
2014-09-30 03:05:49 +00:00
Scott Rowe
d1462247e0
am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown
...
* commit '6287a65cca1d7efb8a265be5b51feca0f1e320f7':
docs: b/16044763 Update IAB docs to give notice of v2 turndown
2014-09-30 00:53:34 +00:00
Ricardo Cervera
3910b5d2f5
am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
...
* commit '6ea34ddfde0aa3c60a83cc4fb7111514be97da9c':
docs: Fixed path for build output.
2014-09-30 00:53:23 +00:00
Justin Koh
91bd876991
am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
...
* commit '92ffd6b5fe11c649483c1ae53ec72a42d33629dd':
DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
2014-09-30 00:53:19 +00:00
Alan Viverette
76e15c4b3a
Merge "Decrease date picker height to avoid cutting off calendar" into lmp-dev
2014-09-30 00:50:39 +00:00
Alan Viverette
b6ca2050c3
Decrease date picker height to avoid cutting off calendar
...
BUG: 17696098
Change-Id: I3d97d8bcd5222bf266dfc75e89759d57ec184515
2014-09-29 17:47:03 -07:00
Scott Rowe
6287a65cca
am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown
...
* commit '294d534787e139119d30eb7a5b4dd1532312018e':
docs: b/16044763 Update IAB docs to give notice of v2 turndown
2014-09-30 00:39:49 +00:00
Ricardo Cervera
6ea34ddfde
am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
...
* commit '9f48394158bce2984a19fe504b7a7f1f673866f3':
docs: Fixed path for build output.
2014-09-30 00:39:39 +00:00
Justin Koh
92ffd6b5fe
am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
...
* commit '28d01e677c05edaa45456a26dff22d1b0fc28164':
DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
2014-09-30 00:39:16 +00:00
Alan Viverette
b805da9b59
Merge "Fix drawable container tinting" into lmp-dev
2014-09-30 00:32:30 +00:00
Alan Viverette
bddb843e79
Fix drawable container tinting
...
BUG: 17704311
Change-Id: Ib9ced41e8589352c852e6c9dc7abbe6e4b9f2520
2014-09-29 17:22:47 -07:00
Jean-Michel Trivi
4a154af9aa
Merge "Send volume keys to the default stream if not actually playing" into lmp-dev
2014-09-30 00:11:14 +00:00
Dianne Hackborn
38646c19d8
Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
2014-09-29 23:06:17 +00:00
Dianne Hackborn
73d6a821ae
Work on issue #17656716 : Unhandled exception in Window Manager
...
Remove the checks for large parcel sizes. Those were triggering,
and identifyng the area of the problem, but also cause a lot of
trouble by making the unsafe deadlocky code there much more likely
to deadlock.
Add logging for strict mode IPCs, since those seem to be the
problem. Only log when things look bad.
Also add a log when battery stats are reset, to diagnose why they
are getting reset when they shouldn't be.
Change-Id: I588c858fb8d8c45f3c9c164ae2de9ae01547b304
2014-09-29 16:04:02 -07:00
Scott Rowe
294d534787
am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown
...
* commit '9d20628b4beb38470d4f7d10193ac5a7cc558d41':
docs: b/16044763 Update IAB docs to give notice of v2 turndown
2014-09-29 22:53:15 +00:00
Chris Craik
e910cc8838
Merge "Implement alpha as documented for drawables" into lmp-dev
2014-09-29 22:20:43 +00:00
Scott Rowe
9d20628b4b
docs: b/16044763 Update IAB docs to give notice of v2 turndown
...
Change-Id: I696c9b22707d34635ab65b392d90aa7406ab40d0
2014-09-29 15:11:46 -07:00
Fabrice Di Meglio
df61d0046c
Fix bug #17682629 Crash while accessing apps' settings
...
- add missing Material resource file
Change-Id: Ibf5f43c0c5a09b4e562fbe8f40778a89b560e211
2014-09-29 21:47:09 +00:00
RoboErik
165809b331
Send volume keys to the default stream if not actually playing
...
This ensures that we'll only adjust volume on a session's stream if
that stream is actually in use.
bug:17690423
Change-Id: I5fce8265a015bbc5034afa16719d9a0bbf257598
2014-09-29 14:43:10 -07:00
Chris Craik
3f873d8644
Implement alpha as documented for drawables
...
bug:17693526
With this change, outline opacity isn't published by default, as was
intended. Default behavior for custom drawables is to have a
rectangular outline, but not cast a shadow, e.g. as a button
background.
Change-Id: If80a256ff359bcb58f3f593ec9018f2df5fc4e44
2014-09-29 21:14:43 +00:00
Stuart Scott
38bfcb4aff
Merge "Get the MCC/MNC using defaults." into lmp-sprout-dev
2014-09-29 21:04:18 +00:00
Deepanshu Gupta
22c8a43452
am 052c4c4b: Merge "Update time in layout preview" into lmp-dev
...
* commit '052c4c4b7a18c6c5e7bf688a647ed142167deddb':
Update time in layout preview
2014-09-29 20:49:35 +00:00
John Spurlock
cbb732a8c4
am 39838b98: Merge "Zen: Fix downtime calculation for Sunday mornings." into lmp-dev
...
* commit '39838b98f1fef11ff29bf682029331849a39a633':
Zen: Fix downtime calculation for Sunday mornings.
2014-09-29 20:49:29 +00:00
Alan Viverette
5f5255c42c
am 1e6775eb: Merge "Update alert dialog message text style, list divider opacity" into lmp-dev
...
* commit '1e6775ebb41ff2b343569c9d21c006fed26d08b3':
Update alert dialog message text style, list divider opacity
2014-09-29 20:49:21 +00:00
Brian Carlstrom
954ffe6efa
am 0824da26: Add string for no boot.art notification
...
* commit '0824da26b4b1311cb594c08bb0e298b7facc1557':
Add string for no boot.art notification
2014-09-29 20:49:15 +00:00
Jorim Jaggi
88126aa170
am b5140130: Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev
...
* commit 'b5140130839e70f1fb55a0bc81b11354b42b820b':
Revert "Add massive logging to investigate blank Keyguard"
2014-09-29 20:49:08 +00:00
Baligh Uddin
3e7c3c397b
am e98a55e8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'e98a55e87e76dad4d5356438dd0068b874c87bab':
Import translations. DO NOT MERGE
2014-09-29 20:49:01 +00:00
Baligh Uddin
d730402020
am 6744422b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '6744422b751cc277ae17020982c6d77a206979aa':
Import translations. DO NOT MERGE
2014-09-29 20:48:54 +00:00
Baligh Uddin
7e40778bae
am 37960312: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '37960312646de29b3271d9bc0d6a07cf4bbd942f':
Import translations. DO NOT MERGE
2014-09-29 20:48:48 +00:00
Baligh Uddin
49b3a054d1
am c570fff1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'c570fff11131e4407536e52e1742c0adb72b3b6f':
Import translations. DO NOT MERGE
2014-09-29 20:48:41 +00:00
Baligh Uddin
f94a7f804c
am 5ce474d7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '5ce474d71e6104095dfcdce56fac56eedbf41199':
Import translations. DO NOT MERGE
2014-09-29 20:48:34 +00:00
Baligh Uddin
a2aec5d7d2
am 04678abb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '04678abbe56051871e83c63bf8328118c432e47c':
Import translations. DO NOT MERGE
2014-09-29 20:48:28 +00:00
Baligh Uddin
e6012bb920
am b09aabfd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'b09aabfd5f40f924e46d7ef635ba46e2a85dde20':
Import translations. DO NOT MERGE
2014-09-29 20:48:22 +00:00