Fan Zhang
5c688f3eae
Merge "2nd attempt to fix Slice strict mode." into pi-dev
...
am: 7d214f99ee
Change-Id: If0e5bec4bc187f4e77848a1af2fd861f8bb7cbdb
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
Matthew Fritze
b9d07718d5
Merge "Add remaining whitelisted controllers" into pi-dev
...
am: da07a66365
Change-Id: I1b4a9e25da8138409d20e960dc68a4e8b5b2e459
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
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
a8c2602987
Merge "Update storage header background to colorPrimary" into pi-dev
...
am: 5431191163
Change-Id: I0163a02a193e3084c7a903e69da0b37a9afa1061
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
bee0516dfe
Merge "Make summary text update after settings changes" into pi-dev
...
am: b915f3566b
Change-Id: I17d63173b63f39acf6bada648a15dc86b1000ce2
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
Jason Monk
667d662d85
Merge "Follow SliceManager API changes" into pi-dev
...
am: d68ed5c92c
Change-Id: Ice176c79605250c263a21cbc624b438902dfaedc
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
Change-Id: I82c793a393ec8bd92f409743173ec79a8ba0387b
2018-05-24 16:35:26 -07:00
Antony Sargent
75ffd61ee3
Merge "Update sound settings icons" into pi-dev
...
am: 2e0709b3b8
Change-Id: Ic6f6658698e824b4eb99799b5c5146c3311a99d4
2018-05-24 16:31:15 -07:00
Lei Yu
4c39b05ad7
Merge "Update icon for battery saver conditon." into pi-dev
...
am: 89e0287711
Change-Id: If5b81203ee4cbf691b236f79f71213f8252ac873
2018-05-24 13:56:57 -07:00
Lucas Dupin
c7a226c27a
Merge "Setting to change sysui theme" into pi-dev
...
am: 7179206395
Change-Id: I34f0fa82b9b9ebb9d6ba7707363a5b948c9f0421
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
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
Antony Sargent
2e0709b3b8
Merge "Update sound settings icons" into pi-dev
2018-05-24 06:12:50 +00:00
Lei Yu
89e0287711
Merge "Update icon for battery saver conditon." into pi-dev
2018-05-24 05:12:28 +00:00
Chihhang Chuang
6719a9b73e
Refactor nfc preference controller
...
- Remove BaseNfcPreferenceController.
- NfcPreferenceController inherit from TogglePreferenceController.
- AndroidBeamPreferenceController inherit from BasePreferenceController.
- Override getIntentFilter in NfcPreferenceController to listen changes.
- Add an API (hasAsyncUpdate) into BasePreferenceController to
distinguish the setting which is updated asynchronously.
Change-Id: I1abe4410169e305a0d6106e24c54e7f2e763fc91
Merged-In: I7c9c48ea7f1ad01a02524beabf9d30baa3db891f
Fixes: 67997761
Fixes: 74887543
Test: RunSettingsRoboTests
2018-05-24 10:31:44 +08:00
Lucas Dupin
7179206395
Merge "Setting to change sysui theme" into pi-dev
2018-05-24 02:15:03 +00:00
Petri Gynther
6cc221169b
Merge "Set default value of A2DP HW offload toggle" into pi-dev
...
am: d6acb081af
Change-Id: I2b39c0b17613fafd88954505bf1d982dcc55014b
2018-05-23 18:09:27 -07:00
Petri Gynther
d6acb081af
Merge "Set default value of A2DP HW offload toggle" into pi-dev
2018-05-23 23:59:19 +00:00
Julia Reynolds
db581cb3d4
Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev
...
am: 718c344daf
Change-Id: Ib539d391b3517e9281337a5ba3972bd8ca21caf1
2018-05-23 16:11:08 -07:00
Antony Sargent
75ae43b5cc
Update sound settings icons
...
In several places we were referencing private icons from
frameworks/base/core instead of versions we already had in
settings. Also add in a "media stream off" icon to match the one we
already had for "media stream on".
Bug: 77982107
Test: manual (Settings->Sound, then use hardware controls to modify
media and ring volumes)
Change-Id: I3a1d808b3028bb4f2feae4536194dc58c3177a66
2018-05-23 15:44:53 -07:00
Jayachandran Chinnakkannu
433cca7577
Merge "Remove connectivity monitor switch from developer options" into pi-dev
...
am: 8d7ccc0074
Change-Id: Ic68439308f7d591595876488afa76e57b9414089
2018-05-23 15:12:55 -07:00
Lei Yu
cbc21a3088
Update icon for battery saver conditon.
...
To make it consistent with quick settings and battery settings.
Change-Id: I990692b53ee87805d92b93cc874f371e0512154e
Fixes: 80157879
Test: Screenshot
2018-05-23 14:56:08 -07:00
Lucas Dupin
b1a2aba01a
Setting to change sysui theme
...
Users now can manually pick if they want light or dark QS
and launcher
Change-Id: Iaabdb32d9af6a293dfbd5ba6dea3da1d38a13ad3
Merged-In: Ic0a43bc5e8777c39bfe5c0bbc606bf6be20f7168
Fixes: 63903361
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemUiThemePreferenceControllerTest
Test: manual
2018-05-23 21:51:32 +00:00
TreeHugger Robot
718c344daf
Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev
2018-05-23 21:49:56 +00:00
Matthew Fritze
a8e1a02bfa
Merge "Hook up blocked keys" into pi-dev
...
am: a60ea38f67
Change-Id: I464e3068051471f05512068bc020866f8d8d8f85
2018-05-23 14:49:32 -07:00
Matthew Fritze
dc001563ae
Merge "Inline slider with header" into pi-dev
...
am: 666ee4fa14
Change-Id: I16c56185628f7dde2a8dbd04bd4b8509163a2fbe
2018-05-23 14:48:51 -07:00
Julia Reynolds
b7bfb04f50
Merge "Use standard displayPreference" into pi-dev
...
am: eba0723a57
Change-Id: I1394513d9d57577af2a5e0a253ff6ecb548e936d
2018-05-23 14:48:08 -07:00
Daichi Ueura
1a2153e6ab
Merge "Hide entire hidden field for non-hidden networks" into pi-dev
...
am: 2c793dfeff
Change-Id: I3cd2bb7d87e371a8db5b1ea693c424b6314f08f2
2018-05-23 14:47:28 -07:00
Fan Zhang
b82d639f34
Merge "Convert BatterySaverButton controller to Slice compatible." into pi-dev
...
am: 87dfe60ad0
Change-Id: I30f5d13f0c5f430b09585ad2114f0f1ad98eebc9
2018-05-23 14:46:45 -07:00
Matthew Fritze
9c49a3a20d
Merge "Return null when setting can't be changed." into pi-dev
...
am: c7b90ee998
Change-Id: I3112475e7cbe477f94c129be78d55b430760df75
2018-05-23 14:45:58 -07:00
Matthew Fritze
b8b2c0c265
Merge "Add Location Slice" into pi-dev
...
am: 53f6b7cb06
Change-Id: I0a18f0a70e9a653acf3fad8bf7c68763aa4d24a3
2018-05-23 14:45:10 -07:00
Matthew Fritze
6f8bfd5fec
Merge "Clear indexing before adding all Slices" into pi-dev
...
am: 842ea91baa
Change-Id: I6a1a0903ac0e7538e013eebe6071d1b7ff496412
2018-05-23 14:44:03 -07:00
Antony Sargent
e3ce1df654
Merge "Update storage, videogame, and vpn icons" into pi-dev
...
am: 28dc3917a9
Change-Id: I7904f669edc41f2d19369a02bb8efdd360d4445f
2018-05-23 14:41:37 -07:00
Matthew Fritze
73ed33af27
Merge "Update airplane mode key to match framework constant" into pi-dev
...
am: 6be5e331cf
Change-Id: Ifb10ad7d2dd23359dab8ee1307751a0b49082cbb
2018-05-23 14:40:55 -07:00
Erik Kline
cf83539e1e
Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev
...
am: 5a0a7ef4bb
Change-Id: I01f80ccf9c733d280b38250e6735717004cbec1b
2018-05-23 14:25:29 -07:00
Jason Monk
20495a8c36
Follow SliceManager API changes
...
Test: make
Bug: 78898947
Change-Id: I5a46ccafe36ad2e0fdac745606d9907f07a86d0c
2018-05-23 17:09:03 -04:00
Jayachandran Chinnakkannu
8d7ccc0074
Merge "Remove connectivity monitor switch from developer options" into pi-dev
2018-05-23 20:57:30 +00:00
Julia Reynolds
a30e046597
DO NOT MERGE Handle usageevents for work profile apps
...
Test: robotests
Change-Id: Ifdc6e456d76614220b2052e6ca8a8f3676d0e2ee
Fixes: 79142791
2018-05-23 20:49:33 +00:00
TreeHugger Robot
a60ea38f67
Merge "Hook up blocked keys" into pi-dev
2018-05-23 20:41:22 +00:00
TreeHugger Robot
666ee4fa14
Merge "Inline slider with header" into pi-dev
2018-05-23 19:32:41 +00:00
Matthew Fritze
4242ed2171
Hook up blocked keys
...
Block any slice in onBind that is the in the blacklist
Change-Id: I9687d07cbfef5fcb94842046bc5dc3296eed4252
Fixes: 80195653
Test: robotests
2018-05-23 12:25:23 -07:00
TreeHugger Robot
eba0723a57
Merge "Use standard displayPreference" into pi-dev
2018-05-23 18:44:28 +00:00
Matthew Fritze
250e26aff9
Inline slider with header
...
Add a header to the slider slices to allow for a second line of text.
This is important to add more context to slices outside of settings.
Fixes: 80157462
Test: robotests
Merged-In: Ida90c9377afb19de320dfce54175f51eee088cfe
Change-Id: I1a1be345e84cbd9f300440e6431d4b331d051dac
2018-05-23 11:28:41 -07:00