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
Chris Craik
e910cc8838
Merge "Implement alpha as documented for drawables" into lmp-dev
2014-09-29 22:20:43 +00: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
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
RoboErik
9eef5bf8d1
Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev
2014-09-29 20:48:11 +00:00
Deepanshu Gupta
052c4c4b7a
Merge "Update time in layout preview" into lmp-dev
2014-09-29 20:35:44 +00:00
RoboErik
df382cada1
Be more paranoid about threading in MediaSessionRecord
...
This makes copies of objects with bundles before posting to another
thread and is more aggressive about locking before making assignments
of mutable objects.
bug:17692568
Change-Id: I28e8229718b862c485e870fd2ca06a3a18a7c454
2014-09-29 13:21:47 -07:00
John Spurlock
39838b98f1
Merge "Zen: Fix downtime calculation for Sunday mornings." into lmp-dev
2014-09-29 20:04:47 +00:00
John Spurlock
d8826bcb2b
Zen: Fix downtime calculation for Sunday mornings.
...
Previous calculation would always exit downtime on Sunday mornings,
due to the target day ending up at zero (an invalid day).
Bug:17682999
Change-Id: Icc5f01a42c3c644170eea9e60442cf77ce15a06c
2014-09-29 15:39:04 -04:00
Alan Viverette
1e6775ebb4
Merge "Update alert dialog message text style, list divider opacity" into lmp-dev
2014-09-29 19:21:22 +00:00
Alan Viverette
c8241c12c4
Update alert dialog message text style, list divider opacity
...
BUG: 17627843
BUG: 17694759
Change-Id: I9c5d08c8dd48b43a2485cc6fd213ef00bdeac8a4
2014-09-29 11:31:30 -07:00
Brian Carlstrom
0824da26b4
Add string for no boot.art notification
...
Bug: 17679443
Change-Id: Ib3283392882e8b35ee3a7903bbf71e8bfa948eed
2014-09-29 11:28:57 -07:00
Deepanshu Gupta
8d5a15b691
Update time in layout preview
...
Change-Id: Ic32a9cb1f20b472c6898a5f370d8578c011a09bf
2014-09-29 09:38:59 -07:00
Jorim Jaggi
b514013083
Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev
2014-09-29 16:31:55 +00:00
Baligh Uddin
e98a55e87e
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-29 16:31:10 +00:00
Baligh Uddin
6744422b75
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-29 16:31:09 +00:00
Baligh Uddin
3796031264
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-29 16:31:03 +00:00
Baligh Uddin
c570fff111
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-29 16:31:03 +00:00
Baligh Uddin
5ce474d71e
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-29 16:30:58 +00:00
Baligh Uddin
04678abbe5
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-29 16:30:58 +00:00
Baligh Uddin
b09aabfd5f
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-29 16:30:54 +00:00
John Spurlock
e5238f7a8d
Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev
2014-09-29 16:28:52 +00:00
Christoph Studer
f7c4509ffb
Merge "NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI" into lmp-dev
2014-09-29 16:13:29 +00:00
Christoph Studer
9ffa50096f
NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI
...
Bug: 17660485
Change-Id: I8684067538fcd2d43a9f95c6aa707b275b13ee40
2014-09-29 18:08:26 +02:00