Fan Zhang
b82d639f34
Merge "Convert BatterySaverButton controller to Slice compatible." into pi-dev
...
am: 87dfe60ad0
Change-Id: I30f5d13f0c5f430b09585ad2114f0f1ad98eebc9
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
Change-Id: I3112475e7cbe477f94c129be78d55b430760df75
2018-05-23 14:45:58 -07:00
Matthew Fritze
b8b2c0c265
Merge "Add Location Slice" into pi-dev
...
am: 53f6b7cb06
Change-Id: I0a18f0a70e9a653acf3fad8bf7c68763aa4d24a3
2018-05-23 14:45:10 -07:00
Matthew Fritze
6f8bfd5fec
Merge "Clear indexing before adding all Slices" into pi-dev
...
am: 842ea91baa
Change-Id: I6a1a0903ac0e7538e013eebe6071d1b7ff496412
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
Change-Id: Ie05b424868cfd46dce36b792a4006dd2cce0aeba
2018-05-23 14:43:19 -07:00
Antony Sargent
e3ce1df654
Merge "Update storage, videogame, and vpn icons" into pi-dev
...
am: 28dc3917a9
Change-Id: I7904f669edc41f2d19369a02bb8efdd360d4445f
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
Change-Id: Ifb10ad7d2dd23359dab8ee1307751a0b49082cbb
2018-05-23 14:40:55 -07:00
Erik Kline
cf83539e1e
Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev
...
am: 5a0a7ef4bb
Change-Id: I01f80ccf9c733d280b38250e6735717004cbec1b
2018-05-23 14:25:29 -07:00
Matthew Fritze
0cf8b408f9
Merge "Add isSliceable API to BasePrefController" into pi-dev
...
am: ef950c24bd
Change-Id: Idbcc5c9960270b5713478aa5f22d524dc52fba91
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
TreeHugger Robot
c7b90ee998
Merge "Return null when setting can't be changed." into pi-dev
2018-05-23 17:08:29 +00:00
TreeHugger Robot
53f6b7cb06
Merge "Add Location Slice" into pi-dev
2018-05-23 16:23:09 +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
842ea91baa
Merge "Clear indexing before adding all Slices" into pi-dev
2018-05-23 13:26:19 +00:00
TreeHugger Robot
e0e49140d2
Merge "Update photo, accessibility, memory, sim, and warning icons" into pi-dev
2018-05-23 05:17:28 +00:00
TreeHugger Robot
28dc3917a9
Merge "Update storage, videogame, and vpn icons" into pi-dev
2018-05-23 03:24:03 +00:00
Matthew Fritze
d9613b2742
Return null when setting can't be changed.
...
If a Slice cannot be changed, return null instead of
an error slice.
Bug: 80155832
Test: robotests
Change-Id: I843fee76cf19d49cc994062059cb231f222120b2
Merged-In: Ib94136c449c6d9c1911f89833bba62fd2263daa4
2018-05-22 20:18:09 -07:00
Matthew Fritze
4b26969839
Clear indexing before adding all Slices
...
Before we index, add a call to clear indexed data before
indexing again. It's an optional call.
Fixes: 80065409
Test: robotests
Change-Id: Iddb0ce02c50d84b51fbf6fc2be0bdc9aa1f5987a
2018-05-22 20:02:20 -07:00
TreeHugger Robot
6be5e331cf
Merge "Update airplane mode key to match framework constant" into pi-dev
2018-05-23 03:00:47 +00:00
TreeHugger Robot
5a0a7ef4bb
Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev
2018-05-23 01:02:39 +00:00
Antony Sargent
49e1397451
Update storage, videogame, and vpn icons
...
Also remove duplicate ic_settings_storage.xml, rename
ic_settings_storage_white.xml to ic_storage_white.xml, and fix up
references.
Bug: 77982107
Test: manual
Change-Id: Icd78c2a2a8d200cb8819d58887455883acdbc668
2018-05-22 17:35:52 -07:00
Matthew Fritze
8ad8516f48
Update airplane mode key to match framework constant
...
Change pref key for airplane mode to "airplane_mode" to match the
constant declared in SettingsSlicesContract.
Bug: 80106671
Test: robotests
Change-Id: I625bed440dd7f1f8509cd00ced5ba67f08a0e737
Merged-In: I898befffbdafc3004fc127414edd04f60ff2554e
2018-05-22 17:34:19 -07:00
Antony Sargent
3802b63246
Update photo, accessibility, memory, sim, and warning icons
...
Bug: 77982107
Test: manual
Change-Id: I8076d1f6115b335693413c9177be79c7af9317a5
2018-05-22 16:50:52 -07:00
TreeHugger Robot
ef950c24bd
Merge "Add isSliceable API to BasePrefController" into pi-dev
2018-05-22 23:40:24 +00:00
Bill Yi
33ad1ae844
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 1dbed5f4f2 -s ours
Change-Id: If38ef61a43b054ab10cc9f58062c43ab19b36347
2018-05-22 15:43:38 -07:00
Matthew Fritze
1dd25fd87c
Add isSliceable API to BasePrefController
...
Only support explicitly approved Settings Slices,
dictated by controllers which return true for the new
method isSliceable.
Updating the supported settings to a whitelist means that
the method to return all available slices must be updated,
and checking slicability when we index slices.
Test: robotests
Change-Id: I85848c2cdf3e151fa94b33dd1dc5c0374ef94b5b
Merged-In: Ib2b9690cdd0036b5cc4a1cb846c52bce7c824ab9
Fixes: 79779103
2018-05-22 22:43:24 +00:00
TreeHugger Robot
1dbed5f4f2
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-05-22 22:37:33 +00:00
Fan Zhang
8486fc70c5
Merge "Make VideoPreference not important for talkback." into pi-dev
...
am: 32c3b87db9
Change-Id: I222b3a652c3345a66799c3920c3183128b37254b
2018-05-22 14:59:09 -07:00
TreeHugger Robot
32c3b87db9
Merge "Make VideoPreference not important for talkback." into pi-dev
2018-05-22 21:31:09 +00:00
Bill Yi
ce93f9e736
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I06fb64abf52b7fdc00173dbc1ce5cb01cb9fcc61
2018-05-22 14:13:06 -07:00
hughchen
a29fe74817
Merge "When BT is off hide rename preference" into pi-dev
...
am: a419c4717d
Change-Id: I505144261b8f06a33ee8cd5280707a2b35180178
2018-05-22 11:00:11 -07:00
TreeHugger Robot
a419c4717d
Merge "When BT is off hide rename preference" into pi-dev
2018-05-22 17:48:31 +00:00
Matthew Fritze
94b265ffe7
Merge "Fix availability status for AOD gestures" into pi-dev
...
am: 39f98e9018
Change-Id: Iea6cab0934634ec124eb8e792d84ae06386ad03c
2018-05-22 10:09:17 -07:00
TreeHugger Robot
39f98e9018
Merge "Fix availability status for AOD gestures" into pi-dev
2018-05-22 16:50:12 +00:00
Fan Zhang
39019c6414
Make VideoPreference not important for talkback.
...
Change-Id: I9856afbd3f5140fa0c426bcc443d2f33e2ffc335
Fixes: 79887358
Test: talkback
2018-05-22 09:45:02 -07:00
hughchen
4e2160904d
When BT is off hide rename preference
...
* Hide the preference when BT is off, shown preference when BT is on.
Bug: 78247352
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDeviceNamePreferenceControllerTest
Change-Id: Id1e11c7b546d7ac5bc8606e8645d07d77f2b522f
2018-05-22 09:35:34 -07:00
Julia Reynolds
4bc1985a8c
Merge "Fix field reordering on toggle switch" into pi-dev
...
am: 8eac6665e8
Change-Id: I64a86334e106e5f0a4a8b3a6140411dc5d0ffabd
2018-05-22 09:17:29 -07:00
Julia Reynolds
8eac6665e8
Merge "Fix field reordering on toggle switch" into pi-dev
2018-05-22 16:09:05 +00:00
Julia Reynolds
a7aee6eea5
Merge "Don't reset channel field when loading the app" into pi-dev
...
am: 7ae4b0bbdc
Change-Id: I5f2a0fc22a698822bbe25c545950dc97364a66a2
2018-05-22 08:46:19 -07:00
TreeHugger Robot
7ae4b0bbdc
Merge "Don't reset channel field when loading the app" into pi-dev
2018-05-22 15:36:22 +00:00
Matthew Fritze
225e3175af
Add Bluetooth Slice
...
am: 25fc14c607
Change-Id: If9d6b6ce4728853523a58329712bb823b35ce087
2018-05-22 08:13:31 -07:00
Julia Reynolds
a65cec7b9a
Fix field reordering on toggle switch
...
Every field needs an explicit order.
Test: manual
Change-Id: Iae533db9e9d240bd0dc14da04a1831fe23005f9e
Fixes: 79749266
2018-05-22 14:20:58 +00:00
Matthew Fritze
25fc14c607
Add Bluetooth Slice
...
Bluetooth slice is added a special case, due to the migration of
bluetooth to a Switch Bar instead of a preference with a controller.
Change-Id: I8b70bb66c862255a4e8d2426ac09939ba6197624
Merged-In: Icfdcd77601ad1e64e0f6c352a8d691f0181515c8
Fixes: 67997327
Test: robotests
2018-05-22 06:59:49 -07:00
Julia Reynolds
306e2d9f84
Don't reset channel field when loading the app
...
Only save data that's changed.
Change-Id: Iaa8265f543a7c1ec418d9d016986e0a253f28df6
Fixes: 79216856
Test: robo tests
2018-05-22 13:43:24 +00:00
Chia-I Wu
2dc9650a76
Merge "Show color modes from config_availableColorModes" into pi-dev
...
am: 5c99a41a9c
Change-Id: I82de74655a8c000580355d857599278c445fe20e
2018-05-22 00:19:54 -07:00
Chia-I Wu
5c99a41a9c
Merge "Show color modes from config_availableColorModes" into pi-dev
2018-05-22 07:09:53 +00:00
Lei Yu
0a084dadc2
Merge "When restrict, use uid inside AppInfo" into pi-dev
...
am: 4376993a87
Change-Id: Ib882c9b94e05e56492d7a85db55564ca91ef46e1
2018-05-21 22:27:29 -07:00
TreeHugger Robot
4376993a87
Merge "When restrict, use uid inside AppInfo" into pi-dev
2018-05-22 05:22:24 +00:00
tim peng
002f385b62
Merge changes I6d4f8ec3,Id4c1e86c into pi-dev
...
am: e3a87548e5
Change-Id: I6c063352b3c2fc6ab3b79baff222c976a5e14184
2018-05-21 21:58:29 -07:00