Christoph Studer
2b7ec633cc
am 97e3cb89: am c93c4fd9: Merge "SysUI: Add no-wallpaper recents theme for low GFX devices" into lmp-dev
...
* commit '97e3cb89ad942d73f7e6b978915ea28818b671ff':
SysUI: Add no-wallpaper recents theme for low GFX devices
2014-09-17 15:03:17 +00:00
Christoph Studer
fe12eaf06c
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:17 +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
390b79c7c5
am 29aa966c: am 5ec57688: Merge "Reorder user icon colors so that the first default is teal" into lmp-dev
...
* commit '29aa966c3d1da78c81da42ae210af517d35a2119':
Reorder user icon colors so that the first default is teal
2014-09-17 12:11:16 +00:00
Alexandra Gherghina
38c6ef9624
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:27 +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
Yorke Lee
201a5e4200
am 70719049: am b23e025a: Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference
...
* commit '707190497f7eedaf7ebad8bc5a9164574b51726d':
Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference
2014-09-17 04:39:04 +00:00
Yorke Lee
9c412fb140
am b23e025a: Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference
...
* commit 'b23e025aab63b2318a5fb711433f51720e8c400b':
Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference
2014-09-17 04:25:58 +00:00
Yorke Lee
2d53951468
am 31e7715a: am 44b693a3: Merge "Add missing methods to Conference object" into lmp-dev
...
* commit '31e7715aff6e6b19e9f104baf7e590b387da8d8b':
Add missing methods to Conference object
2014-09-17 03:59:57 +00:00
Nancy Chen
54f8319790
am af4eaa19: am 05a2c7ef: Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev
...
* commit 'af4eaa198af6f99387c09982fa9a40371ba4e16c':
Remove ability to enable/disable phoneaccounts (1/6)
2014-09-17 03:59:53 +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
edac2c611b
am 44b693a3: Merge "Add missing methods to Conference object" into lmp-dev
...
* commit '44b693a3cdee9908223723e961a29fbfc0305163':
Add missing methods to Conference object
2014-09-17 03:41:10 +00:00
Nancy Chen
68e3e27a1e
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 03:41:02 +00: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 Lee
7228132aab
am c54d2d71: am 9feb839b: Merge "Fix disconnect log printf in ConnectionService." into lmp-dev
...
* commit 'c54d2d71b75285254c223f64ecdee3288ed2485f':
Fix disconnect log printf in ConnectionService.
2014-09-17 02:35:53 +00:00
Andrew Lee
a2a62e4161
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:31 +00:00
Jungshik Jang
ab5f2f1480
am f7d23fc5: am f88be2c7: Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-dev
...
* commit 'f7d23fc59c64024249489605adc7409f47192555':
Adjust volume bar visibility in HDMI-CEC system audio mode
2014-09-17 02:00:27 +00:00
Yuncheol Heo
404fe18045
am 3d75058e: am 41f887c4: Merge "Remove MHL related code." into lmp-dev
...
* commit '3d75058eafd11a6adc0907a1534b8505bbc8b937':
Remove MHL related code.
2014-09-17 02:00:23 +00:00
mike dooley
97c0f9423b
am fb8c53ac: am c7932a06: Merge "Fix a small printf format bug." into lmp-dev
...
* commit 'fb8c53ac0c464679b8bec4a38cea870ecdb52abb':
Fix a small printf format bug.
2014-09-17 02:00:19 +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
8210ad6f85
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:38:25 +00:00
Yuncheol Heo
09097a13d1
am 41f887c4: Merge "Remove MHL related code." into lmp-dev
...
* commit '41f887c4620cb33041b2844314770c56605d2679':
Remove MHL related code.
2014-09-17 01:38:21 +00:00
mike dooley
4b57a89597
am c7932a06: Merge "Fix a small printf format bug." into lmp-dev
...
* commit 'c7932a06f76db95a44163d1feb68dcc8af411627':
Fix a small printf format bug.
2014-09-17 01:38:15 +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
281e94cf65
am b68528cd: am 3061d2b9: Merge "Fix issue #17507017 : took ~3 seconds to move an app to the foreground" into lmp-dev
...
* commit 'b68528cd3fda0b10064fdd4d9f4ef79afacaac2a':
Fix issue #17507017 : took ~3 seconds to move an app to the foreground
2014-09-17 00:28:11 +00:00
Dianne Hackborn
9091f9b906
am 1e4d9476: am 1a7cb969: Merge "Fix issue #16662560 : SingleTop activity is getting instantiated multiple time" into lmp-dev
...
* commit '1e4d9476d4313e352b80d53ccf36bd9a6e844e72':
Fix issue #16662560 : SingleTop activity is getting instantiated multiple time
2014-09-17 00:28:07 +00:00
Robert Greenwalt
f10a848754
am 061ac1be: am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
...
* commit '061ac1be70acff38bb2caa58bd3b6ea08c2e79a9':
Add NetworkAgent event for ExplicitlySelected
2014-09-17 00:28:04 +00:00
Dianne Hackborn
e55039dc96
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:04 +00:00
Dianne Hackborn
d3f69e7d80
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:00 +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
Robert Greenwalt
9e1d9f0fb2
am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
...
* commit 'd0675e37718d3223623e4fbf0f5e8e0e46c10d5f':
Add NetworkAgent event for ExplicitlySelected
2014-09-17 00:13:54 +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
e7b26be378
Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
2014-09-17 00:06:03 +00:00
Adrian Roos
1378434063
am bf665282: am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
...
* commit 'bf665282fe1a0b7caf9dc5a2b3ba5378d3ac35f3':
Fix broken dispatch of onApplyWindowInsets
2014-09-17 00:05:58 +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
d804482660
am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
...
* commit '8f4cafc281eb2c40b409f86ad276b4337f5fd317':
Fix broken dispatch of onApplyWindowInsets
2014-09-16 23:58:07 +00:00
Brian Attwell
c990260259
am 9c943a94: am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev
...
* commit '9c943a94ad9926611ca960b9abd481a7e7ad1263':
Pass different dy into dispatchNestedSCroll
2014-09-16 23:54:57 +00:00
Brian Attwell
598c4f9329
am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev
...
* commit '56d143ae20eb731d2826fe6efdf330f3c7c14071':
Pass different dy into dispatchNestedSCroll
2014-09-16 23:45:03 +00:00
Adrian Roos
543f21da46
Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
2014-09-16 23:42:40 +00:00
Alan Viverette
e3aecc6c02
am b22bd84e: am 67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev
...
* commit 'b22bd84e6cb81a1e27688011631498f441f6f393':
Preserve NPE behavior of removed TextView.getTextColors() API
2014-09-16 23:41:35 +00:00
Alan Viverette
cf7cc557d8
am 86633337: am 07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev
...
* commit '866333376e1a6933e194ab8989b77c84be8ad334':
Fix TimePicker.setCurrentHour() when argument is 0
2014-09-16 23:41:31 +00:00
Alan Viverette
d2ab11651a
am 27cf6cec: am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev
...
* commit '27cf6cecf11c6afa918ff860ccb2f24ae94b38af':
Ensure we always have valid colors in CaptionStyle
2014-09-16 23:41:27 +00:00