Matthew Fritze
8e54e4a0f5
Merge "Hook up blocked keys" into pi-dev am: a60ea38f67
...
am: a8e1a02bfa
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
2018-05-23 16:06:19 -07:00
Julia Reynolds
fea643e243
Merge "Use standard displayPreference" into pi-dev am: eba0723a57
...
am: b7bfb04f50
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
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
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
2018-05-23 16:03:41 -07:00
Matthew Fritze
43c5f7bc1c
[automerger skipped] Merge "Add Location Slice" into pi-dev am: 53f6b7cb06
...
am: b8b2c0c265
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
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
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
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
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
2018-05-23 15:59:09 -07:00
Matthew Fritze
a8e1a02bfa
Merge "Hook up blocked keys" into pi-dev
...
am: a60ea38f67
2018-05-23 14:49:32 -07:00
Matthew Fritze
dc001563ae
Merge "Inline slider with header" into pi-dev
...
am: 666ee4fa14
2018-05-23 14:48:51 -07:00
Julia Reynolds
b7bfb04f50
Merge "Use standard displayPreference" into pi-dev
...
am: eba0723a57
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
2018-05-23 14:47:28 -07:00
Fan Zhang
b82d639f34
Merge "Convert BatterySaverButton controller to Slice compatible." into pi-dev
...
am: 87dfe60ad0
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
2018-05-23 14:45:58 -07:00
Matthew Fritze
b8b2c0c265
Merge "Add Location Slice" into pi-dev
...
am: 53f6b7cb06
2018-05-23 14:45:10 -07:00
Matthew Fritze
6f8bfd5fec
Merge "Clear indexing before adding all Slices" into pi-dev
...
am: 842ea91baa
2018-05-23 14:44:03 -07:00
Antony Sargent
107242f7b1
Merge "Update photo, accessibility, memory, sim, and warning icons" into pi-dev
...
am: e0e49140d2
2018-05-23 14:43:19 -07:00
Antony Sargent
e3ce1df654
Merge "Update storage, videogame, and vpn icons" into pi-dev
...
am: 28dc3917a9
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
2018-05-23 14:40:55 -07:00
Erik Kline
cf83539e1e
Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev
...
am: 5a0a7ef4bb
2018-05-23 14:25:29 -07:00
TreeHugger Robot
a60ea38f67
Merge "Hook up blocked keys" into pi-dev
2018-05-23 20:41:22 +00:00
TreeHugger Robot
9ae99272cf
Merge "Update phone vibrate icon in condition card."
2018-05-23 20:35:24 +00:00
TreeHugger Robot
666ee4fa14
Merge "Inline slider with header" into pi-dev
2018-05-23 19:32:41 +00:00
TreeHugger Robot
1cedea2383
Merge "Refactor nfc preference controller"
2018-05-23 19:29:44 +00:00
TreeHugger Robot
93bbca22bf
Merge "Inline slider with header"
2018-05-23 19:29:24 +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
Fan Zhang
18fb991a8e
Update phone vibrate icon in condition card.
...
Bug: 80157879
Test: visual
Change-Id: I836582056f2da7c7aa379ac84302bf84b398924a
2018-05-23 12:23:45 -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
Matthew Fritze
647be5fc91
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.
Bug: 80157462
Test: robotests
Change-Id: Ida90c9377afb19de320dfce54175f51eee088cfe
2018-05-23 11:26:54 -07:00
Matthew Fritze
41cbe4b78d
[automerger skipped] Merge "Add isSliceable API to BasePrefController" into pi-dev am: ef950c24bd
...
am: 0cf8b408f9
2018-05-23 11:25:35 -07:00
TreeHugger Robot
2c793dfeff
Merge "Hide entire hidden field for non-hidden networks" into pi-dev
2018-05-23 18:15:04 +00:00
Matthew Fritze
0cf8b408f9
Merge "Add isSliceable API to BasePrefController" into pi-dev
...
am: ef950c24bd
2018-05-23 10:52:35 -07:00
TreeHugger Robot
87dfe60ad0
Merge "Convert BatterySaverButton controller to Slice compatible." into pi-dev
2018-05-23 17:16:48 +00:00
Fan Zhang
6162b04751
Merge "Convert BatterySaverButton controller to Slice compatible."
2018-05-23 17:14:35 +00:00
TreeHugger Robot
c7b90ee998
Merge "Return null when setting can't be changed." into pi-dev
2018-05-23 17:08:29 +00:00
Jayachandran Chinnakkannu
b7647b9340
Merge "Remove connectivity monitor switch from developer options"
2018-05-23 16:57:56 +00:00
Julia Reynolds
b9676e9076
Use standard displayPreference
...
For notification fields. This is required for them to
display properly within an 'advanced' preference category.
Test: robotests, manual
Change-Id: I1e1ff0e801e136c6a86a0d9164ed21d4160e897a
Fixes: 80132743
2018-05-23 16:44:44 +00:00
TreeHugger Robot
53f6b7cb06
Merge "Add Location Slice" into pi-dev
2018-05-23 16:23:09 +00:00
Daichi Ueura
9555afb64e
Hide entire hidden field for non-hidden networks
...
This CL hides not just hidden network spinner but entire
hidden field when a user is adding a network from scanned
network list.
Test: robotests
Bug: 80114851
Change-Id: I8b29fd764d62af1e46beaa7d26fae97848f4efe6
2018-05-23 09:18:07 -07:00
TreeHugger Robot
2626288bfa
Merge "Return null when setting can't be changed."
2018-05-23 16:01:22 +00:00
Matthew Fritze
e31e60ce94
Add Location Slice
...
Location is an intent-only Slice.
Test: Robotests
Change-Id: Ie9ed05be2224f2c4b393ed201d5f313f80183edc
Merged-In: I07e27683b46fe4ded8215009a983bb909555fb59
Fixes: 67997314
2018-05-23 08:09:07 -07:00
Fan Zhang
db03de4e80
Convert BatterySaverButton controller to Slice compatible.
...
- Update preference key to match the key defined in SettingsSlicesContract
- Model TwoStateButtonPreference similar to TwoStatePreference (add
setChecked, isChecked method)
- Remove TwoStateButtonPreferenceController entirely because all methods
are moved into Preference directly for better encapsulation.
- Make BatterySaverButtonPrefController direclty implement
TogglePreferenceController. It was not possible before because the
interface between TwoStateButtonPreferene is too different from
TwoStatePreference.
Bug: 80106671
Test: robotests
Change-Id: Ib72807dcf1b36e959e08df8d80538c3f9f79b76d
Merged-In: Ib72807dcf1b36e959e08df8d80538c3f9f79b76d
2018-05-23 08:00:41 -07:00
TreeHugger Robot
44a05fbb50
Merge "Add Location Slice"
2018-05-23 13:44:05 +00:00
TreeHugger Robot
842ea91baa
Merge "Clear indexing before adding all Slices" into pi-dev
2018-05-23 13:26:19 +00:00
Chihhang Chuang
3b387a028a
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: I7c9c48ea7f1ad01a02524beabf9d30baa3db891f
Fixes: 67997761
Fixes: 74887543
Test: RunSettingsRoboTests
2018-05-23 13:58:28 +08:00
