Fan Zhang
ff62b28996
[automerger skipped] Merge "2nd attempt to fix Slice strict mode." into pi-dev am: 7d214f99ee
...
am: 5c688f3eae
2018-05-25 12:53:57 -07:00
Fan Zhang
5c688f3eae
Merge "2nd attempt to fix Slice strict mode." into pi-dev
...
am: 7d214f99ee
2018-05-25 12:49:29 -07:00
TreeHugger Robot
7d214f99ee
Merge "2nd attempt to fix Slice strict mode." into pi-dev
2018-05-25 19:44:32 +00:00
TreeHugger Robot
9534fbdf1b
Merge "2nd attempt to fix Slice strict mode."
2018-05-25 18:41:28 +00:00
Fan Zhang
934de22622
2nd attempt to fix Slice strict mode.
...
1. Use real BluetoothAdapter instead of settingslib version. The
settingslib version contains calls that violates strictmode rules.
2. Override StrictMode rules in SettingsSliceProvider when it's called
in background thread. When in background, the enforcement from Slice
framework (StrictMode#ThreadPolicy) is not useful and can be safely
ignored.
Change-Id: I68523148f4c1dc88a54e207447d21ec439478cdf
Bug: 79985175
Test: robotests
2018-05-25 10:39:59 -07:00
Matthew Fritze
77c0715424
[automerger skipped] Merge "Add remaining whitelisted controllers" into pi-dev am: da07a66365
...
am: b9d07718d5
2018-05-25 10:06:14 -07:00
Matthew Fritze
b9d07718d5
Merge "Add remaining whitelisted controllers" into pi-dev
...
am: da07a66365
2018-05-25 10:02:14 -07:00
TreeHugger Robot
da07a66365
Merge "Add remaining whitelisted controllers" into pi-dev
2018-05-25 16:53:44 +00:00
TreeHugger Robot
fdef0464e9
Merge "Add remaining whitelisted controllers"
2018-05-25 16:47:57 +00:00
Fan Zhang
2313b24215
2nd attempt to fix Slice strict mode.
...
1. Use real BluetoothAdapter instead of settingslib version. The
settingslib version contains calls that violates strictmode rules.
2. Override StrictMode rules in SettingsSliceProvider when it's called
in background thread. When in background, the enforcement from Slice
framework (StrictMode#ThreadPolicy) is not useful and can be safely
ignored.
Change-Id: I68523148f4c1dc88a54e207447d21ec439478cdf
Merged-In: I68523148f4c1dc88a54e207447d21ec439478cdf
Fixes: 79985175
Test: robotests
2018-05-25 16:37:56 +00:00
Fan Zhang
cf84bf0d6a
[automerger skipped] Merge "Update storage header background to colorPrimary" into pi-dev am: 5431191163
...
am: a8c2602987
2018-05-25 09:03:55 -07:00
Fan Zhang
a8c2602987
Merge "Update storage header background to colorPrimary" into pi-dev
...
am: 5431191163
2018-05-25 08:59:26 -07:00
Fan Zhang
5431191163
Merge "Update storage header background to colorPrimary" into pi-dev
2018-05-25 15:49:59 +00:00
Matthew Fritze
aec3296b56
[automerger skipped] Merge "Make summary text update after settings changes" into pi-dev am: b915f3566b
...
am: bee0516dfe
2018-05-25 08:13:12 -07:00
Matthew Fritze
bee0516dfe
Merge "Make summary text update after settings changes" into pi-dev
...
am: b915f3566b
2018-05-25 08:09:13 -07:00
TreeHugger Robot
b915f3566b
Merge "Make summary text update after settings changes" into pi-dev
2018-05-25 15:01:26 +00:00
TreeHugger Robot
038d1f9db5
Merge "Make summary text update after settings changes"
2018-05-25 14:52:59 +00:00
Ivan Chiang
95abf59af4
Fix gray out previously connected device preference issue
...
Count the dock devices in previously connected device controller.
Fix: 80227045
Test: m -j SettingsRoboTests RunSettingsRoboTests
Change-Id: I08d82ec715698ecf894a4a7cd0631c5f1de0f591
Merged-In: I08d82ec715698ecf894a4a7cd0631c5f1de0f591
2018-05-25 08:51:30 +00:00
Jason Monk
7c3c3b1154
Merge "Follow SliceManager API changes" into pi-dev am: d68ed5c92c
...
am: 667d662d85
2018-05-24 23:51:44 -07:00
Chihhang Chuang
17711f73f7
[automerger skipped] Merge "Refactor nfc preference controller" into pi-dev am: 2357c1cd84
...
am: 6c1c1a6a50
2018-05-24 23:51:04 -07:00
Antony Sargent
97e418f45c
Merge "Update sound settings icons" into pi-dev am: 2e0709b3b8
...
am: 75ffd61ee3
2018-05-24 23:50:12 -07:00
Antony Sargent
493847ea8e
Merge "Refresh several icons" into pi-dev am: 642e63c2e0
...
am: ef75735861
2018-05-24 23:49:40 -07:00
Antony Sargent
0cb786e81c
Merge "Refresh system update icon" into pi-dev am: efc2cb0492
...
am: 30c39c273c
2018-05-24 23:49:07 -07:00
Lei Yu
3a9bad927e
Merge "Update icon for battery saver conditon." into pi-dev am: 89e0287711
...
am: 4c39b05ad7
2018-05-24 23:48:36 -07:00
Lucas Dupin
d3cefa27cf
[automerger skipped] Merge "Setting to change sysui theme" into pi-dev am: 7179206395
...
am: c7a226c27a
2018-05-24 23:48:03 -07:00
Antony Sargent
3e85b13253
Merge "Refresh battery status icons" into pi-dev am: 64379a08f7
...
am: bc375150de
2018-05-24 23:47:23 -07:00
Antony Sargent
ef5a3eeade
Merge "Updated misc. settings icon" into pi-dev am: c3d2e78d82
...
am: 7e62c0bffa
2018-05-24 23:46:36 -07:00
Petri Gynther
6a2ed0aed5
Merge "Set default value of A2DP HW offload toggle" into pi-dev am: d6acb081af
...
am: 6cc221169b
2018-05-24 23:46:01 -07:00
Jason Monk
667d662d85
Merge "Follow SliceManager API changes" into pi-dev
...
am: d68ed5c92c
2018-05-24 19:04:31 -07:00
Jason Monk
d68ed5c92c
Merge "Follow SliceManager API changes" into pi-dev
2018-05-25 01:21:35 +00:00
Chihhang Chuang
6c1c1a6a50
Merge "Refactor nfc preference controller" into pi-dev
...
am: 2357c1cd84
2018-05-24 16:35:26 -07:00
Antony Sargent
75ffd61ee3
Merge "Update sound settings icons" into pi-dev
...
am: 2e0709b3b8
2018-05-24 16:31:15 -07:00
Antony Sargent
ef75735861
Merge "Refresh several icons" into pi-dev
...
am: 642e63c2e0
2018-05-24 16:18:05 -07:00
Antony Sargent
30c39c273c
Merge "Refresh system update icon" into pi-dev
...
am: efc2cb0492
2018-05-24 16:06:22 -07:00
TreeHugger Robot
8653748a18
Merge "Fix a NPE when highlighting fingerprint row."
2018-05-24 21:44:50 +00:00
Lei Yu
4c39b05ad7
Merge "Update icon for battery saver conditon." into pi-dev
...
am: 89e0287711
2018-05-24 13:56:57 -07:00
Lucas Dupin
c7a226c27a
Merge "Setting to change sysui theme" into pi-dev
...
am: 7179206395
2018-05-24 13:39:19 -07:00
Matthew Fritze
a2ea991101
Make summary text update after settings changes
...
The uri's being pinged when changes happened were incorrect, because
of a hard coded '/'.
Change-Id: I4d04642bc80b97c5191bf0e1e7a5e15a2c58d6c9
Merged-In: I6735c5a60dc7df6894bd17e67d7702a7ec6c07d4
Fixes: 79779837
Test: robotest
2018-05-24 20:10:24 +00:00
Matthew Fritze
06600041bc
Make summary text update after settings changes
...
The uri's being pinged when changes happened were incorrect, because
of a hard coded '/'.
Bug: 79779837
Test: robotest
Change-Id: I6735c5a60dc7df6894bd17e67d7702a7ec6c07d4
2018-05-24 13:08:23 -07:00
Android Build Merger (Role)
1871d3d3a7
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead skipped: b9aa0fbfe9
...
Change-Id: Ib0b9bdb830263bbfb7c81033b388cd9e07e591ef
2018-05-24 18:22:37 +00:00
Android Build Merger (Role)
b9aa0fbfe9
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead
...
Change-Id: I164f89c547721b6b02fcd2bf57b224c92816e25b
2018-05-24 18:22:35 +00:00
Android Build Merger (Role)
30d0145ead
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e
...
Change-Id: I72e34eb278333a310cab6845c79f55df50478860
2018-05-24 18:22:34 +00:00
Android Build Merger (Role)
93ee1bd17e
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f
...
Change-Id: Ic7873dae0f097a546b250ebcb96cf88a437e1173
2018-05-24 18:22:33 +00:00
Android Build Merger (Role)
551be9a85f
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f
...
Change-Id: Ibb61117b7475504a756dafece07c5d79eba0f73f
2018-05-24 18:22:32 +00:00
Android Build Merger (Role)
874c51780f
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282
...
Change-Id: Ieb0dfe22926f14109466bd00c9cac9ccaa04e057
2018-05-24 18:22:30 +00:00
Android Build Merger (Role)
cb66517282
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724
...
Change-Id: I2b731c3a29f4fde5a672c9224008e7be7e460b72
2018-05-24 18:22:29 +00:00
Android Build Merger (Role)
5b4de5e724
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d
...
Change-Id: I1ba9495afe9e105926ad407442d732f2c6e92cf5
2018-05-24 18:22:19 +00:00
Fan Zhang
e2f520bcaf
Update storage header background to colorPrimary
...
Change-Id: I07f78cc6452846829b92d25fe9c41c6efe40a459
Merged-In: If13d5cbd2bd7db1c6d9c9f840281601ab78ba267
Fixes: 79773433
Test: visual
2018-05-24 17:50:33 +00:00
TreeHugger Robot
2357c1cd84
Merge "Refactor nfc preference controller" into pi-dev
2018-05-24 17:45:19 +00:00
Matthew Fritze
61227fb093
Add remaining whitelisted controllers
...
Because I missed them in the long whitelist the first time...
Change-Id: I9fbd7b33e06b3f2f6e5e5778f78abfdb1a52006a
Merged-In: I01c8c80fe306667c1d3ac007b16fad546c5a5f40
Fixes: 79779103
Test: robotests
2018-05-24 17:29:03 +00:00
