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
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
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
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
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
9ae99272cf
Merge "Update phone vibrate icon in condition card."
2018-05-23 20:35:24 +00:00
Fan Zhang
13c7e68646
Fix a NPE when highlighting fingerprint row.
...
If fingerprint pref is not bound to UI yet, then its view is null so we
can't do any ripple animation on it.
Change-Id: I0ccca2dfdb471ab520677c6cd206205230959b27
Fixes: 80147956
Test: manual
2018-05-23 20:29:01 +00:00
Antony Sargent
e888cbb88f
Refresh battery status icons
...
Change-Id: I4835c10135a469c61f641879bb09d366160ff612
Fixes: 80152468
Test: manual
2018-05-23 12:47:00 -07: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
Antony Sargent
e0eeafcb5d
Merge translations of Bluetooth confirmation text
...
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name
Bug: 62672248
Test: manual
Change-Id: Iab08b43768f0aedd690570eb59dcb71c14c04784
2018-05-23 18:02:36 +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
