Commit Graph

46193 Commits

Author SHA1 Message Date
Matthew Fritze
ce6de9b5b8 [automerger skipped] Merge "Update airplane mode key to match framework constant" into pi-dev am: 6be5e331cf
am: 73ed33af27  -s ours

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

Change-Id: Ia06f5bef6d4103cf65a2c07d8dadecfa815080f7
2018-05-23 15:59:09 -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
9ae99272cf Merge "Update phone vibrate icon in condition card." 2018-05-23 20:35:24 +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
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
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  -s ours

Change-Id: I01a7cd3c08acb13773cd920bc95d5f1dbbdc9297
2018-05-23 11:25:35 -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
Fan Zhang
6162b04751 Merge "Convert BatterySaverButton controller to Slice compatible." 2018-05-23 17:14:35 +00:00
Jayachandran Chinnakkannu
b7647b9340 Merge "Remove connectivity monitor switch from developer options" 2018-05-23 16:57:56 +00:00
TreeHugger Robot
2626288bfa Merge "Return null when setting can't be changed." 2018-05-23 16:01:22 +00:00
TreeHugger Robot
44a05fbb50 Merge "Add Location Slice" 2018-05-23 13:44:05 +00:00
Chihhang Chuang
3b387a028a 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: I7c9c48ea7f1ad01a02524beabf9d30baa3db891f
Fixes: 67997761
Fixes: 74887543
Test: RunSettingsRoboTests
2018-05-23 13:58:28 +08:00
Matthew Fritze
f1a7006d31 Add Location Slice
Location is an intent-only Slice.

Test: Robotests
Bug: 67997314
Change-Id: I07e27683b46fe4ded8215009a983bb909555fb59
2018-05-22 21:13:47 -07:00
Fan Zhang
ddc6c646c0 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
2018-05-22 20:22:26 -07:00
Matthew Fritze
417693021e Return null when setting can't be changed.
If a Slice cannot be changed, return null instead of
an error slice.

Bug: 80155832
Test: robotestst
Change-Id: Ib94136c449c6d9c1911f89833bba62fd2263daa4
2018-05-22 20:17:10 -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
Matthew Fritze
8f36eb8cfb 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: I898befffbdafc3004fc127414edd04f60ff2554e
2018-05-22 18:51:11 -07:00
TreeHugger Robot
5a0a7ef4bb Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev 2018-05-23 01:02:39 +00: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
TreeHugger Robot
ef950c24bd Merge "Add isSliceable API to BasePrefController" into pi-dev 2018-05-22 23:40:24 +00:00
Bill Yi
c4a3393b45 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 1dbed5f4f2 -s ours
am: 33ad1ae844  -s ours

Change-Id: Ic00088c41f062fefaa3168b7daaa25c4d00ccba5
2018-05-22 15:47:46 -07: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
ac3b2ff89e Merge "Make VideoPreference not important for talkback." into pi-dev am: 32c3b87db9
am: 8486fc70c5

Change-Id: Ibb75b4b608061a622c3c56041802722100a934c7
2018-05-22 15:05:48 -07: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
TreeHugger Robot
f81fe9c354 Merge "Add isSliceable API to BasePrefController" 2018-05-22 21:02:45 +00:00
Jayachandran C
127bfcfe2d Remove connectivity monitor switch from developer options
Test: Verify connectivity monitor switch is no more shown
      under developer options

Bug: 79255514
Change-Id: I755885398b92a726b0b979815c33793abe01ea66
2018-05-22 13:24:33 -07:00
hughchen
d9f1e1c049 Merge "When BT is off hide rename preference" into pi-dev am: a419c4717d
am: a29fe74817

Change-Id: I9e2068de44126344af52532fbe076acd9121883d
2018-05-22 11:18:15 -07:00
Matthew Fritze
bf1f5b5813 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
Bug: 79779103
Change-Id: Ib2b9690cdd0036b5cc4a1cb846c52bce7c824ab9
2018-05-22 11:06:42 -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
17939388e3 [automerger skipped] Merge "Fix availability status for AOD gestures" into pi-dev am: 39f98e9018
am: 94b265ffe7  -s ours

Change-Id: I4eb4d086a1ad220969ce9f3ae90618db628a02f6
2018-05-22 10:19:54 -07: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
b98f69c89a Merge "Fix field reordering on toggle switch" into pi-dev am: 8eac6665e8
am: 4bc1985a8c

Change-Id: I8db22efc4042ee91c2a3fbb3d6bfc632a91344b3
2018-05-22 09:24:48 -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
49d8b0a3e4 Merge "Don't reset channel field when loading the app" into pi-dev am: 7ae4b0bbdc
am: a7aee6eea5

Change-Id: Ib6804e0fa325d04360b620aa36f043c6c707db1b
2018-05-22 08:51:52 -07:00
TreeHugger Robot
1a825ca803 Merge "Fix availability status for AOD gestures" 2018-05-22 15:48:21 +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