Andrew Solovay
e37aa3612b
am 37fce2bc: am 67267dcf: am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
...
* commit '37fce2bca37c59ee4c733a6ced3c5be48c77aef6':
Docs: Updated to include new Subscriptions functionality.
2014-09-17 17:17:02 +00:00
Chris Craik
4e458aca82
am b5a27aee: Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev
...
* commit 'b5a27aee532343a3c66d91c04c8d238ff35b31db':
Handle premultiplication correctly for ColorMatrixColorFilters
2014-09-17 17:11:00 +00:00
Andrew Solovay
b1c066fa5c
am 67267dcf: am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
...
* commit '67267dcf909e080ea3adf902c8a9df115bd1b279':
Docs: Updated to include new Subscriptions functionality.
2014-09-17 17:09:46 +00:00
Chris Craik
ba9d58516c
Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev
2014-09-17 17:01:35 +00:00
Chris Craik
73821c8d2b
Handle premultiplication correctly for ColorMatrixColorFilters
...
bug:17405627
Previously, the input content to the color matrix computation was left
premultiplied. Since the color matrix could reduce the alpha channel,
the alpha was re-multiplied, but this was incomplete, and incorrect.
Instead, apply the color matrix in unpremultiplied space.
Change-Id: I87b8e03d2e228e6ded81f7bbfea952605d7a095c
2014-09-17 10:00:34 -07:00
Esteban Talavera
d96693806f
am 62bdf3ea: Merge "Add \'adb dpm\' subcommand to set profile owner" into lmp-dev
...
* commit '62bdf3ea21de9b9d8ecada58eb1d7f7838b94e2f':
Add 'adb dpm' subcommand to set profile owner
2014-09-17 15:44:41 +00:00
Esteban Talavera
63b328bdeb
Merge "Add 'adb dpm' subcommand to set profile owner" into lmp-dev
2014-09-17 15:37:27 +00:00
Christoph Studer
8f72479397
am c93c4fd9: Merge "SysUI: Add no-wallpaper recents theme for low GFX devices" into lmp-dev
...
* commit 'c93c4fd964680f49e4542c88ec6cdf4c7b925c91':
SysUI: Add no-wallpaper recents theme for low GFX devices
2014-09-17 14:56:16 +00:00
Christoph Studer
9077cbc30e
Merge "SysUI: Add no-wallpaper recents theme for low GFX devices" into lmp-dev
2014-09-17 14:17:33 +00:00
Alexandra Gherghina
381b657859
am 5ec57688: Merge "Reorder user icon colors so that the first default is teal" into lmp-dev
...
* commit '5ec5768864e9a9dfc4dac4d0afe2f0593b070d08':
Reorder user icon colors so that the first default is teal
2014-09-17 12:01:28 +00:00
Alexandra Gherghina
16ebe98d9a
Merge "Reorder user icon colors so that the first default is teal" into lmp-dev
2014-09-17 11:49:29 +00:00
Christoph Studer
37e4468be1
SysUI: Add no-wallpaper recents theme for low GFX devices
...
Also add a config flag to control the theme to apply to RecentsActivity.
Bug: 17522143
Change-Id: I8d03e84e37b77698243673f6c4e676b2c53e0d07
2014-09-17 13:28:46 +02:00
Andrew Solovay
67267dcf90
am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
...
* commit '6c6664c95d7935398909e798e0aad451a2a83b1b':
Docs: Updated to include new Subscriptions functionality.
2014-09-17 06:12:12 +00:00
Andrew Solovay
6c6664c95d
am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
...
* commit 'a209406faa1f2b0f1dd7b6e3c5a468729f1c562f':
Docs: Updated to include new Subscriptions functionality.
2014-09-17 06:01:09 +00:00
Yorke Lee
04c5ecae44
am b23e025a: Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference
...
* commit 'b23e025aab63b2318a5fb711433f51720e8c400b':
Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference
2014-09-17 04:33:10 +00:00
Yorke Lee
4819634a0d
am 44b693a3: Merge "Add missing methods to Conference object" into lmp-dev
...
* commit '44b693a3cdee9908223723e961a29fbfc0305163':
Add missing methods to Conference object
2014-09-17 04:32:46 +00:00
Nancy Chen
d69cc64d44
am 05a2c7ef: Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev
...
* commit '05a2c7ef905777fdbc1129146df6f389e2e6980a':
Remove ability to enable/disable phoneaccounts (1/6)
2014-09-17 04:32:40 +00:00
Yorke Lee
58bacc513c
Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference
...
Bug: 17512380
Change-Id: Ie26bef643bdec97f64247b5f8099f2676ae6c63e
2014-09-16 20:44:09 -07:00
Yorke Lee
1c4eb10cc1
Merge "Add missing methods to Conference object" into lmp-dev
2014-09-17 03:29:12 +00:00
Nancy Chen
ebc69cd19e
Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev
2014-09-17 03:23:04 +00:00
Andrew Solovay
a209406faa
Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
2014-09-17 02:21:10 +00:00
Andrew Lee
4e3762ae1c
am 9feb839b: Merge "Fix disconnect log printf in ConnectionService." into lmp-dev
...
* commit '9feb839b7d77654dc7598b5c2f85aaa06be81e9d':
Fix disconnect log printf in ConnectionService.
2014-09-17 02:00:00 +00:00
Andrew Lee
009348e837
Merge "Fix disconnect log printf in ConnectionService." into lmp-dev
2014-09-17 01:52:54 +00:00
Jungshik Jang
756b5836ae
am f88be2c7: Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-dev
...
* commit 'f88be2c79ab5cb980fee2fff22c41d62100f4165':
Adjust volume bar visibility in HDMI-CEC system audio mode
2014-09-17 01:36:32 +00:00
Yuncheol Heo
8ac35890fe
am 41f887c4: Merge "Remove MHL related code." into lmp-dev
...
* commit '41f887c4620cb33041b2844314770c56605d2679':
Remove MHL related code.
2014-09-17 01:36:27 +00:00
mike dooley
c38e080692
am c7932a06: Merge "Fix a small printf format bug." into lmp-dev
...
* commit 'c7932a06f76db95a44163d1feb68dcc8af411627':
Fix a small printf format bug.
2014-09-17 01:36:21 +00:00
Jungshik Jang
c1e1550bf4
Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-dev
2014-09-17 01:29:54 +00:00
Jungshik Jang
1a6be6ed39
Adjust volume bar visibility in HDMI-CEC system audio mode
...
When HDMI-CEC system audio mode is activated.
1. Hide volume bar when volume button is pressed in TV
2. Show volume bar when TV receives volume notification from
Audio Receiver.
Otherwise, (system audio mode off) follows normal TV's behavior.
Bug: 17347499
Change-Id: I1f5bc14285d60d8626a8fbbef9e1959cae7d193b
2014-09-17 10:28:40 +09:00
Yuncheol Heo
afd6f342ad
Merge "Remove MHL related code." into lmp-dev
2014-09-17 01:28:26 +00:00
mike dooley
9891bbeae2
Merge "Fix a small printf format bug." into lmp-dev
2014-09-17 01:25:14 +00:00
Andrew Lee
2678639f9e
Fix disconnect log printf in ConnectionService.
...
Bug: 17534940
Change-Id: I41499701d1f7a3ab0816624d27094c6c86fb5b01
2014-09-16 18:17:44 -07:00
Yuncheol Heo
da6e9f10d0
Remove MHL related code.
...
Bug: 17479050
Change-Id: Id4a76ccf7325c78817d1b3c3460e5dc40e23831b
2014-09-17 10:15:40 +09:00
mike dooley
f34519b4dd
Fix a small printf format bug.
...
Bug: 17534940
Change-Id: Idc3c1105c72714f138b07012d0ad9e0bf0ba17f1
2014-09-16 18:14:14 -07:00
Dianne Hackborn
cf3e052139
am 3061d2b9: Merge "Fix issue #17507017 : took ~3 seconds to move an app to the foreground" into lmp-dev
...
* commit '3061d2b984eed5b9e2d60748cea0a111ba52c758':
Fix issue #17507017 : took ~3 seconds to move an app to the foreground
2014-09-17 00:21:45 +00:00
Dianne Hackborn
44dd996b62
am 1a7cb969: Merge "Fix issue #16662560 : SingleTop activity is getting instantiated multiple time" into lmp-dev
...
* commit '1a7cb969b833be16632cbcadc498a1fb978ca659':
Fix issue #16662560 : SingleTop activity is getting instantiated multiple time
2014-09-17 00:21:40 +00:00
Dianne Hackborn
6035379865
Merge "Fix issue #17507017 : took ~3 seconds to move an app to the foreground" into lmp-dev
2014-09-17 00:14:44 +00:00
Dianne Hackborn
1a526f582b
Merge "Fix issue #16662560 : SingleTop activity is getting instantiated multiple time" into lmp-dev
2014-09-17 00:13:38 +00:00
Robert Greenwalt
42a69ffa04
am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
...
* commit 'd0675e37718d3223623e4fbf0f5e8e0e46c10d5f':
Add NetworkAgent event for ExplicitlySelected
2014-09-17 00:13:14 +00:00
Robert Greenwalt
e7b26be378
Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
2014-09-17 00:06:03 +00:00
Robert Greenwalt
e73cc4646b
Add NetworkAgent event for ExplicitlySelected
...
Lets Wifi tell us when the user selected this AP vs auto-connected.
bug:17396168
Change-Id: I6e067ab62ed49040629aa31fe07ff880d3d542f0
2014-09-16 17:03:59 -07:00
Adrian Roos
aa52631f7c
am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
...
* commit '8f4cafc281eb2c40b409f86ad276b4337f5fd317':
Fix broken dispatch of onApplyWindowInsets
2014-09-16 23:58:06 +00:00
Brian Attwell
9958a3ad32
am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev
...
* commit '56d143ae20eb731d2826fe6efdf330f3c7c14071':
Pass different dy into dispatchNestedSCroll
2014-09-16 23:45:41 +00:00
Adrian Roos
543f21da46
Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
2014-09-16 23:42:40 +00:00
Brian Attwell
5665c0f265
Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev
2014-09-16 23:33:24 +00:00
Alan Viverette
8058f9774f
am 67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev
...
* commit '67798394819f1b8af9afb8f35fda0d0f0552f027':
Preserve NPE behavior of removed TextView.getTextColors() API
2014-09-16 23:30:15 +00:00
Alan Viverette
5a4b2bf9b2
am 07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev
...
* commit '07e867a059a6bef19fb92663d02a03a90cd356e8':
Fix TimePicker.setCurrentHour() when argument is 0
2014-09-16 23:30:10 +00:00
Alan Viverette
d82fa0d3c8
am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev
...
* commit '37cbd74ad6dc3c7639e2ce8200ca40a2acc275ef':
Ensure we always have valid colors in CaptionStyle
2014-09-16 23:30:03 +00:00
ztenghui
d1df07897e
am 0fed84e1: Merge "Update the progress bar to square instead of round lineCap" into lmp-dev
...
* commit '0fed84e1e4674353892143103ba0ebdf36b0c71d':
Update the progress bar to square instead of round lineCap
2014-09-16 23:29:58 +00:00
Alan Viverette
af8e823d99
Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev
2014-09-16 23:25:07 +00:00
Alan Viverette
4813482324
Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev
2014-09-16 23:23:23 +00:00