Jason Monk
7c3c3b1154
Merge "Follow SliceManager API changes" into pi-dev am: d68ed5c92c
...
am: 667d662d85
2018-05-24 23:51:44 -07:00
Chihhang Chuang
17711f73f7
[automerger skipped] Merge "Refactor nfc preference controller" into pi-dev am: 2357c1cd84
...
am: 6c1c1a6a50
2018-05-24 23:51:04 -07:00
Antony Sargent
97e418f45c
Merge "Update sound settings icons" into pi-dev am: 2e0709b3b8
...
am: 75ffd61ee3
2018-05-24 23:50:12 -07:00
Antony Sargent
493847ea8e
Merge "Refresh several icons" into pi-dev am: 642e63c2e0
...
am: ef75735861
2018-05-24 23:49:40 -07:00
Antony Sargent
0cb786e81c
Merge "Refresh system update icon" into pi-dev am: efc2cb0492
...
am: 30c39c273c
2018-05-24 23:49:07 -07:00
Lei Yu
3a9bad927e
Merge "Update icon for battery saver conditon." into pi-dev am: 89e0287711
...
am: 4c39b05ad7
2018-05-24 23:48:36 -07:00
Lucas Dupin
d3cefa27cf
[automerger skipped] Merge "Setting to change sysui theme" into pi-dev am: 7179206395
...
am: c7a226c27a
2018-05-24 23:48:03 -07:00
Antony Sargent
3e85b13253
Merge "Refresh battery status icons" into pi-dev am: 64379a08f7
...
am: bc375150de
2018-05-24 23:47:23 -07:00
Antony Sargent
ef5a3eeade
Merge "Updated misc. settings icon" into pi-dev am: c3d2e78d82
...
am: 7e62c0bffa
2018-05-24 23:46:36 -07:00
Petri Gynther
6a2ed0aed5
Merge "Set default value of A2DP HW offload toggle" into pi-dev am: d6acb081af
...
am: 6cc221169b
2018-05-24 23:46:01 -07:00
Jason Monk
667d662d85
Merge "Follow SliceManager API changes" into pi-dev
...
am: d68ed5c92c
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
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
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
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
TreeHugger Robot
2357c1cd84
Merge "Refactor nfc preference controller" into pi-dev
2018-05-24 17:45:19 +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
Julia Reynolds
429c787168
[automerger skipped] Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev am: 718c344daf
...
am: db581cb3d4
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
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
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
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
2018-05-23 16:08:46 -07:00
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
