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
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
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
android-build-team Robot
c96472cfad
Snap for 4801384 from 2e0709b3b8 to pi-release
...
Change-Id: I5954c59bd42debb8cab1a6fa46c71bf5485cbc34
2018-05-24 07:27:58 +00: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
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
2018-05-23 18:49:06 -07:00
Antony Sargent
7e62c0bffa
Merge "Updated misc. settings icon" into pi-dev
...
am: c3d2e78d82
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
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
Julia Reynolds
db581cb3d4
Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev
...
am: 718c344daf
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
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
