Commit Graph

45157 Commits

Author SHA1 Message Date
Matthew Fritze
a8e1a02bfa Merge "Hook up blocked keys" into pi-dev
am: a60ea38f67

Change-Id: I464e3068051471f05512068bc020866f8d8d8f85
2018-05-23 14:49:32 -07:00
Matthew Fritze
dc001563ae Merge "Inline slider with header" into pi-dev
am: 666ee4fa14

Change-Id: I16c56185628f7dde2a8dbd04bd4b8509163a2fbe
2018-05-23 14:48:51 -07:00
Julia Reynolds
b7bfb04f50 Merge "Use standard displayPreference" into pi-dev
am: eba0723a57

Change-Id: I1394513d9d57577af2a5e0a253ff6ecb548e936d
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

Change-Id: I3cd2bb7d87e371a8db5b1ea693c424b6314f08f2
2018-05-23 14:47:28 -07:00
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
TreeHugger Robot
a60ea38f67 Merge "Hook up blocked keys" into pi-dev 2018-05-23 20:41:22 +00:00
TreeHugger Robot
666ee4fa14 Merge "Inline slider with header" into pi-dev 2018-05-23 19:32:41 +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
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
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

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
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
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