John Spurlock
ffca85400f
am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev
...
* commit 'a1b84165f9520c025c59f5b2d93a65d4609b8088':
Don't play hint animations when dozing
2014-09-30 16:41:14 +00:00
John Spurlock
a1b84165f9
Merge "Don't play hint animations when dozing" into lmp-dev
2014-09-30 16:35:26 +00:00
Jason Monk
d1b1947b89
am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev
...
* commit 'e7b18d2bab30ca257b63e9029c6e08b9700b89a6':
Pull roaming from mServiceState for consistency
2014-09-30 15:55:07 +00:00
George Mount
a5e8b16767
am 8afceda1: Merge "Clear preordered list after use." into lmp-dev
...
* commit '8afceda14176b911cf755b8ebbcfbfa9eff60aae':
Clear preordered list after use.
2014-09-30 15:55:03 +00:00
John Spurlock
72fd266961
am ee98df79: Doze: Log screenOnFromTouch when flinging.
...
* commit 'ee98df79a1797323aaa6d645e9cd5dc6a7cc0ee4':
Doze: Log screenOnFromTouch when flinging.
2014-09-30 15:54:55 +00:00
Jorim Jaggi
d7912d2f10
Don't play hint animations when dozing
...
Bug: 17718416
Change-Id: I2c27b4ea479ee46612eb5284a2c872d03dc52ab0
2014-09-30 17:38:19 +02:00
Jason Monk
e7b18d2bab
Merge "Pull roaming from mServiceState for consistency" into lmp-dev
2014-09-30 15:30:11 +00:00
George Mount
8afceda141
Merge "Clear preordered list after use." into lmp-dev
2014-09-30 14:58:21 +00:00
Matthew Williams
75a507c3d8
am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev
...
* commit 'bc156ba430d286aaab8deb7bbb3bccc655cd2e92':
Fix deadlock caused by clearAllBackoffs in SSE
2014-09-30 14:56:35 +00:00
Lorenzo Colitti
b5271649aa
am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
...
* commit 'd8f7e048281559462f9c590f9d7d48fb7fe065ce':
Update LegacyTypeTracker state before sending connect broadcasts.
2014-09-30 14:56:30 +00:00
Scott Rowe
4fdded1a0b
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-09-30 14:56:06 +00:00
Ricardo Cervera
1ae343a055
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-09-30 14:56:02 +00:00
Justin Koh
18636703d9
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-09-30 14:55:58 +00:00
Alan Viverette
4722acda7e
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-09-30 14:55:54 +00:00
Alan Viverette
d11215b8bb
am b805da9b: Merge "Fix drawable container tinting" into lmp-dev
...
* commit 'b805da9b592e67cb777b78db3a96d47c60e31ca7':
Fix drawable container tinting
2014-09-30 14:55:36 +00:00
Jean-Michel Trivi
7768ecccf7
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-09-30 14:55:31 +00:00
Dianne Hackborn
ccd08f23b0
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-09-30 14:55:26 +00:00
Chris Craik
75533864ac
am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev
...
* commit 'e910cc88387f49b119bb2f8e579849864970ac87':
Implement alpha as documented for drawables
2014-09-30 14:55:26 +00:00
Fabrice Di Meglio
d072fe8ef0
am df61d004: Fix bug #17682629 Crash while accessing apps\' settings
...
* commit 'df61d0046cb901f75d2758aa443190371b4cc746':
Fix bug #17682629 Crash while accessing apps' settings
2014-09-30 14:55:25 +00:00
RoboErik
129874b2d9
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 14:55:24 +00:00
Deepanshu Gupta
aece3c05d0
am 052c4c4b: Merge "Update time in layout preview" into lmp-dev
...
* commit '052c4c4b7a18c6c5e7bf688a647ed142167deddb':
Update time in layout preview
2014-09-30 14:55:23 +00:00
John Spurlock
a932e9448d
am 39838b98: Merge "Zen: Fix downtime calculation for Sunday mornings." into lmp-dev
...
* commit '39838b98f1fef11ff29bf682029331849a39a633':
Zen: Fix downtime calculation for Sunday mornings.
2014-09-30 14:55:22 +00:00
Alan Viverette
bf07602f99
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-30 14:55:21 +00:00
Brian Carlstrom
3dd5b991ad
am 0824da26: Add string for no boot.art notification
...
* commit '0824da26b4b1311cb594c08bb0e298b7facc1557':
Add string for no boot.art notification
2014-09-30 14:55:20 +00:00
Jorim Jaggi
6db0bd8bbb
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-30 14:55:19 +00:00
Baligh Uddin
785f3fc18c
am e98a55e8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'e98a55e87e76dad4d5356438dd0068b874c87bab':
Import translations. DO NOT MERGE
2014-09-30 14:55:18 +00:00
Baligh Uddin
80ae10be66
am 6744422b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '6744422b751cc277ae17020982c6d77a206979aa':
Import translations. DO NOT MERGE
2014-09-30 14:55:17 +00:00
Baligh Uddin
31b277fbc7
am 37960312: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '37960312646de29b3271d9bc0d6a07cf4bbd942f':
Import translations. DO NOT MERGE
2014-09-30 14:55:17 +00:00
Baligh Uddin
b51f4f8888
am c570fff1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'c570fff11131e4407536e52e1742c0adb72b3b6f':
Import translations. DO NOT MERGE
2014-09-30 14:55:16 +00:00
Baligh Uddin
7f12567c1a
am 5ce474d7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '5ce474d71e6104095dfcdce56fac56eedbf41199':
Import translations. DO NOT MERGE
2014-09-30 14:55:15 +00:00
Baligh Uddin
faa59573e7
am 04678abb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '04678abbe56051871e83c63bf8328118c432e47c':
Import translations. DO NOT MERGE
2014-09-30 14:55:14 +00:00
Baligh Uddin
f5d2e43533
am b09aabfd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'b09aabfd5f40f924e46d7ef635ba46e2a85dde20':
Import translations. DO NOT MERGE
2014-09-30 14:55:13 +00:00
John Spurlock
e88efd75bb
am e5238f7a: Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev
...
* commit 'e5238f7a8db90ebc0e8875adaff84efc198f0800':
DozeLog: Keep keyguard monitor alive, keep emer call stats.
2014-09-30 14:55:12 +00:00
Christoph Studer
98fc6dbef5
am f7c4509f: Merge "NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI" into lmp-dev
...
* commit 'f7c4509ffbbe6b1849c3ea61edac8d1d23906eaa':
NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI
2014-09-30 14:55:11 +00:00
Adrian Roos
e26dcaa20c
am 51a400eb: Merge "Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams" into lmp-dev
...
* commit '51a400eb440c89fb06a47371bb7b026f00edb09c':
Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams
2014-09-30 14:55:11 +00:00
Jorim Jaggi
227339fde2
am 79107083: Merge "Add option to enable scrim SRC optimization" into lmp-dev
...
* commit '79107083ca50b99c9e7b678d7739b9ab4798db0f':
Add option to enable scrim SRC optimization
2014-09-30 14:55:10 +00:00
Jorim Jaggi
e7d9475a91
am e2ff1a4e: Merge "Fix overdraw" into lmp-dev
...
* commit 'e2ff1a4edbe5c8eeb2610a62b8cfe7a58d4c8150':
Fix overdraw
2014-09-30 14:55:09 +00:00
Selim Cinek
6f0975d0dd
am 311fc0b3: Fixed a crash that could occur in the ObservableScrollView
...
* commit '311fc0b399f01a79169ae69aea05556043a7d7df':
Fixed a crash that could occur in the ObservableScrollView
2014-09-30 14:55:08 +00:00
Paul Jensen
107837aa28
am 89e0f093: Move mobile provisioning APN support into telephony.
...
* commit '89e0f0937a70d73b5ed188c9337b4d33860e5573':
Move mobile provisioning APN support into telephony.
2014-09-30 14:55:07 +00:00
jgu21
3c415bd1a8
am 20867871: (-s ours) Frameworks/base: Early init native bridge
...
* commit '208678718f9f8db3bc279c7d5bd1445af2831ae3':
Frameworks/base: Early init native bridge
2014-09-30 14:55:06 +00:00
George Mount
bc6d38938e
am 8120652b: Order GhostViews so that they display in their ghosted view\'s order.
...
* commit '8120652bb1155d762d945c1a3bf1636b6825dbd2':
Order GhostViews so that they display in their ghosted view's order.
2014-09-30 14:55:05 +00:00
Svetoslav
ce8d47600b
am 922fcc2f: Merge "Crash in print spooler if save to PDF selected early." into lmp-dev
...
* commit '922fcc2f9e2370b34672af0e91e5754c6f8d6da7':
Crash in print spooler if save to PDF selected early.
2014-09-30 14:55:04 +00:00
Svetoslav
ed62f5d8c8
am b179bed3: Merge "Fix carsh in print spooler if custom print setings return bad pages." into lmp-dev
...
* commit 'b179bed35302704bce809029ab424f919de351c3':
Fix carsh in print spooler if custom print setings return bad pages.
2014-09-30 14:55:03 +00:00
Svetoslav
8976ab39d9
am ed2fdc6e: Accessibility node provider getting invalid virtual view id.
...
* commit 'ed2fdc6ef560c76ba310a2c4e5bb63f01d08af40':
Accessibility node provider getting invalid virtual view id.
2014-09-30 14:55:01 +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
Jason Monk
1cd44e3ab4
Pull roaming from mServiceState for consistency
...
Also consolidate roaming logic while here, to make it easier to
maintain.
Bug: 17514906
Bug: 17619763
Change-Id: I8efabdecc26722ff6ac70d715f3befaae989abdc
2014-09-30 10:05:46 -04: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