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
Antony Sargent
ef75735861
Merge "Refresh several icons" into pi-dev
...
am: 642e63c2e0
Change-Id: I2487a06fb681680209dd5b37b7b6f376bb2d6640
2018-05-24 16:18:05 -07:00
Antony Sargent
30c39c273c
Merge "Refresh system update icon" into pi-dev
...
am: efc2cb0492
Change-Id: Ie611915fc682d75201655c4308c3e7ba71953910
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
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
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
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
Matthew Fritze
0cb62643d6
Add remaining whitelisted controllers
...
Because I missed them in the long whitelist the first time...
Bug: 79779103
Test: robotests
Change-Id: I01c8c80fe306667c1d3ac007b16fad546c5a5f40
2018-05-24 10:27:29 -07:00
Antony Sargent
2e0709b3b8
Merge "Update sound settings icons" into pi-dev
2018-05-24 06:12:50 +00:00
Antony Sargent
642e63c2e0
Merge "Refresh several icons" into pi-dev
2018-05-24 06:11:57 +00:00
Antony Sargent
efc2cb0492
Merge "Refresh system update icon" into pi-dev
2018-05-24 06:09:22 +00:00
Lei Yu
89e0287711
Merge "Update icon for battery saver conditon." into pi-dev
2018-05-24 05:12:28 +00:00
Julia Reynolds
429c787168
[automerger skipped] Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev am: 718c344daf
...
am: db581cb3d4
-s ours
Change-Id: I016f444e1edc45973698901f02450327218e5303
2018-05-23 19:32:43 -07: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
Antony Sargent
bc375150de
Merge "Refresh battery status icons" into pi-dev
...
am: 64379a08f7
Change-Id: Ief175d64ec2dad05d188ed9aa12cfaf0b74c4758
2018-05-23 18:49:06 -07:00
Antony Sargent
7e62c0bffa
Merge "Updated misc. settings icon" into pi-dev
...
am: c3d2e78d82
Change-Id: Ie61946bfa07c093748a5c4553988d6f1f87c1ef3
2018-05-23 18:38:40 -07: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
TreeHugger Robot
64379a08f7
Merge "Refresh battery status icons" into pi-dev
2018-05-24 01:04:53 +00:00
TreeHugger Robot
c3d2e78d82
Merge "Updated misc. settings icon" into pi-dev
2018-05-24 01:03:50 +00:00
Petri Gynther
d6acb081af
Merge "Set default value of A2DP HW offload toggle" into pi-dev
2018-05-23 23:59:19 +00:00
Antony Sargent
3015cc9e36
Refresh system update icon
...
Bug: 77982107
Test: manual
Change-Id: Ifad137b464fce62cbba0f456da4a773f556a1004
2018-05-23 16:23:23 -07:00
Antony Sargent
daccaef797
Refresh several icons
...
This CL includes the following:
-account
-backup
-display
-folder
-location
-multiuser
-security
Bug: 77982107
Test: manual
Change-Id: I921e20d100bf4b3cb4af7326a5aac2b4e5629196
2018-05-23 16:22:20 -07:00
TreeHugger Robot
acee9007f6
Merge "Setting to change sysui theme"
2018-05-23 23:22:15 +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
Jayachandran Chinnakkannu
981791df47
[automerger skipped] Merge "Remove connectivity monitor switch from developer options" into pi-dev am: 8d7ccc0074
...
am: 433cca7577
-s ours
Change-Id: Ia9177fc830d5f99ea2c9ace03a88ab62525c3642
2018-05-23 16:08:46 -07:00
Matthew Fritze
8e54e4a0f5
Merge "Hook up blocked keys" into pi-dev am: a60ea38f67
...
am: a8e1a02bfa
Change-Id: Ib79a5fe4721086f400477dc159e14ab5e641e304
2018-05-23 16:06:57 -07:00
Matthew Fritze
270ac03126
[automerger skipped] Merge "Inline slider with header" into pi-dev am: 666ee4fa14
...
am: dc001563ae
-s ours
Change-Id: I57208dd70a098e15792b339ea6353ee218ab67eb
2018-05-23 16:06:19 -07:00
Julia Reynolds
fea643e243
Merge "Use standard displayPreference" into pi-dev am: eba0723a57
...
am: b7bfb04f50
Change-Id: I8f6704247d5e633cc1d6cd3d75403837606fca03
2018-05-23 16:05:38 -07:00
Daichi Ueura
cbd04dcade
Merge "Hide entire hidden field for non-hidden networks" into pi-dev am: 2c793dfeff
...
am: 1a2153e6ab
Change-Id: Id5dc0b1855520c9071ce3b8c2897f2b69d3b3791
2018-05-23 16:05:02 -07:00
Fan Zhang
a17d1b03dc
[automerger skipped] Merge "Convert BatterySaverButton controller to Slice compatible." into pi-dev am: 87dfe60ad0
...
am: b82d639f34
-s ours
Change-Id: I6970932b5536ee4938e20802ce8041295b4923d7
2018-05-23 16:04:20 -07:00
Matthew Fritze
2a11158392
[automerger skipped] Merge "Return null when setting can't be changed." into pi-dev am: c7b90ee998
...
am: 9c49a3a20d
-s ours
Change-Id: I14fa7dc962384c564ad9ff1c96528b40b7bbb31b
2018-05-23 16:03:41 -07:00
Matthew Fritze
43c5f7bc1c
[automerger skipped] Merge "Add Location Slice" into pi-dev am: 53f6b7cb06
...
am: b8b2c0c265
-s ours
Change-Id: If6e5d2770bc799232342be8a1103c94fdb5f1914
2018-05-23 16:02:53 -07:00
Matthew Fritze
e656ffd83c
Merge "Clear indexing before adding all Slices" into pi-dev am: 842ea91baa
...
am: 6f8bfd5fec
Change-Id: I4a56f4af28b980480c17b4de918b3aeb052f40e5
2018-05-23 16:02:00 -07:00
Antony Sargent
cbbcac2ac3
Merge "Update photo, accessibility, memory, sim, and warning icons" into pi-dev am: e0e49140d2
...
am: 107242f7b1
Change-Id: I386a9b1902a36f7cc16ec0bd8e773de6678d8516
2018-05-23 16:01:21 -07:00
Antony Sargent
507fe6d909
Merge "Update storage, videogame, and vpn icons" into pi-dev am: 28dc3917a9
...
am: e3ce1df654
Change-Id: Ic5906d22df49ca2236727c7edcd6192426795fcb
2018-05-23 16:00:31 -07:00
Matthew Fritze
ce6de9b5b8
[automerger skipped] Merge "Update airplane mode key to match framework constant" into pi-dev am: 6be5e331cf
...
am: 73ed33af27
-s ours
Change-Id: I2564e4d3938d9798588ea9ef98c7830e120c24e3
2018-05-23 15:59:52 -07:00
Erik Kline
e1a5ac804d
Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev am: 5a0a7ef4bb
...
am: cf83539e1e
Change-Id: Ia06f5bef6d4103cf65a2c07d8dadecfa815080f7
2018-05-23 15:59:09 -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
Lucas Dupin
74fde3ea31
Setting to change sysui theme
...
Users now can manually pick if they want light or dark QS
and launcher
Change-Id: Ic0a43bc5e8777c39bfe5c0bbc606bf6be20f7168
Fixes: 63903361
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemUiThemePreferenceControllerTest
Test: manual
2018-05-23 15:20:17 -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