Commit Graph

2812 Commits

Author SHA1 Message Date
Shuzhen Wang
8f9fc06a18 Revert "Settings: Add logical camera default switch"
This reverts commit a9578a2b8a.

Test: Build
Bug: 80007047
Merged-In: Id5f01e5de94ffaa86de1e96f6bde1092b0c586a2
2018-06-04 17:37:25 +00:00
TreeHugger Robot
e4999751ab Merge "Remove Advanced dropdown from "About phone" screen" into pi-dev 2018-05-25 21:35:23 +00:00
Antony Sargent
24283d3076 Remove Advanced dropdown from "About phone" screen
All the items will appear in the list instead of hiding some under an Advanced
dropdown.

Bug: 80302533
Test: manual (Settings->System->About phone)

Change-Id: I82857ec8e027b00762c1191d9450d30dfe47016f
2018-05-25 13:05:27 -07:00
TreeHugger Robot
da07a66365 Merge "Add remaining whitelisted controllers" into pi-dev 2018-05-25 16:53:44 +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
Antony Sargent
2e0709b3b8 Merge "Update sound settings icons" into pi-dev 2018-05-24 06:12:50 +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
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
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
Jayachandran Chinnakkannu
8d7ccc0074 Merge "Remove connectivity monitor switch from developer options" into pi-dev 2018-05-23 20:57:30 +00:00
Jayachandran C
f0cc6b754e Remove connectivity monitor switch from developer options
Test: Verify connectivity monitor switch is no more shown
      under developer options

Bug: 79255514
Change-Id: I755885398b92a726b0b979815c33793abe01ea66
Merged-In: I755885398b92a726b0b979815c33793abe01ea66
2018-05-23 16:59:01 +00: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
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
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
TreeHugger Robot
fbe8e0f11e Merge "Change Night Display slice title to "NightDisplay"" into pi-dev 2018-05-21 21:37:38 +00:00
Matthew Fritze
6394a1425c Change Night Display slice title to "NightDisplay"
Fixes: 80093098
Test: Slice browser for UI change
Change-Id: I4999d375f76d914095d4af234aaeb31e32fe798f
2018-05-21 20:52:15 +00:00
Chienyuan
c96606500f Add developer options toggle for Bluetooth A2DP hardware offload
Bug: 63932139
Bug: 79568680
Test: robotests
Change-Id: I54943cb591be1bfed0cdfe7eebf90bad64ce13c7
Merged-In: I54943cb591be1bfed0cdfe7eebf90bad64ce13c7
2018-05-18 23:40:22 -07:00
TreeHugger Robot
0e721c598e Merge "Make user explicitly set security type for tether network" into pi-dev 2018-05-19 03:17:17 +00:00
Salvador Martinez
d9bae5a15e Make user explicitly set security type for tether network
This was made implicit which is confusing for the user so this CL
adds a preference to make the user manually choose their security
type.

Test: robotests
Fixes: 79435112
Change-Id: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
Merged-In: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
2018-05-19 02:14:18 +00:00
TreeHugger Robot
871d93a564 Merge "Settings: Add logical camera default switch" into pi-dev 2018-05-19 01:27:11 +00:00
TreeHugger Robot
863b27270d Merge "Add controller to show the summary" into pi-dev 2018-05-19 01:26:12 +00:00
Shuzhen Wang
a9578a2b8a Settings: Add logical camera default switch
Add a switch to make logical camera as default camera (with smaller
camera id) for 3rd party app.

Test: Manually using Settings app, RunSettingsRoboTests
Bug: 77600932
Change-Id: I86c7f3b9830fb376b324621feb31cdfac59faee5
Merged-In: I86c7f3b9830fb376b324621feb31cdfac59faee5
2018-05-18 23:01:03 +00:00
TreeHugger Robot
55642ef91b Merge "Updated delete icon" into pi-dev 2018-05-18 21:38:51 +00:00
hughchen
fd7c9650ed Add controller to show the summary
* Add AdvancedConnectedDeviceController that used to show which component is available
* Add getConnectedDevices Summary Resource Id() to decide which string should be shown.
  Here have  4 cases to shown the string.
  case 1: driving mode available and NFC is availalbe, show "Bluetooth, driving mode, NFC"
  case 2: driving mode available and NFC is not availalbe, show "Bluetooth, driving mode"
  case 3: driving mode not available and NFC is availalbe, show "Bluetooth, NFC"
  case 4: driving mode not available and NFC not availalbe, show "Bluetooth"
* Add test to verify the summary string is correct in each condition
* Add test to verify getAvailabilityStatus() is AVAILABLE.

Bug: 79299421
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedConnectedDeviceControllerTest
Change-Id: I1048355bbd344db3ab645dd1537b4259eff57f38
Merged-In: I1048355bbd344db3ab645dd1537b4259eff57f38
2018-05-18 18:17:27 +00:00
TreeHugger Robot
d24c9e4a80 Merge "Grey the previously connected device preference" into pi-dev 2018-05-18 03:21:57 +00:00
hughchen
980b718989 Grey the previously connected device preference
* Add PreviouslyConnectedDevicePreferenceController to handle the preference should be
  enable or disable.
  Example: If there are no previously connected devices disable the preference otherwise
  enable it.
* Add PreviouslyConnectedDevicePreferenceControllerTest
  1. Verify the callback can be registered and unregistered
  2. Verify the preference is enable when there
     have more than 1 previously connected device
  3. Verify the preference is disable when there
     have no previously connected device

Bug: 78250052
Test: make -j50 RunSettingsRoboTests
Change-Id: I31b5d416aaf907c3bbf1cb61de6e7401463e3df7
Merged-In: I31b5d416aaf907c3bbf1cb61de6e7401463e3df7
2018-05-18 02:16:23 +00:00
Antony Sargent
0d9afde271 Updated delete icon
Also remove the duplicate ic_menu_delete.xml and fix up places where it
was used.

Bug: 77982107
Test: manual
Change-Id: I23ede37b7cdf9bea59b44cd0f817bf0ad0cd1d69
2018-05-17 11:55:40 -07:00
TreeHugger Robot
24bbc4bfe1 Merge "Get rid of divider above ringtone selector" into pi-dev 2018-05-17 13:34:34 +00:00
TreeHugger Robot
667cbc5846 Merge "Add “Rename device” on Bluetooth screen" into pi-dev 2018-05-17 09:08:30 +00:00
TreeHugger Robot
273faa216e Merge "Bluetooth and NFC added back to Connection preferences" into pi-dev 2018-05-17 09:06:18 +00:00
TreeHugger Robot
e3319d0449 Merge "Move app setting link from Entity header to pref controller" into pi-dev 2018-05-16 20:51:17 +00:00
Fan Zhang
cac18e12ac Move app setting link from Entity header to pref controller
Change-Id: I13a27486a9c9b4c4fb358715d678473e63c1b624
Merged-In: I13a27486a9c9b4c4fb358715d678473e63c1b624
Fixes: 79688822
Test: robotest
2018-05-16 19:56:33 +00:00
TreeHugger Robot
a0f9241400 Merge "Support Vibrate for calls in Settings Slices" into pi-dev 2018-05-16 18:48:14 +00:00
Beverly
3f42a23816 Get rid of divider above ringtone selector
Change-Id: I939d1ab061fb55853fbc0505b8d9025715b9df97
Fixes: 79480349
Test: manual
2018-05-16 14:28:15 -04:00
hughchen
52feedf354 Bluetooth and NFC added back to Connection preferences
* Bluetooth and NFC added back to "Connection preferences"

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I8f4c389c28c7cc752f198be2b59b28b6e9af2c90
Merged-In: I8f4c389c28c7cc752f198be2b59b28b6e9af2c90
2018-05-16 17:03:31 +00:00
hughchen
4e0e3c83e8 Change string from "Add device" to "Pair new device"
Change string from "Add device" to "Pair new device"

Bug: 79298886
Test: Build pass
Change-Id: Iac4e251d5fab794f90e98911208f026d62b91659
2018-05-16 19:17:06 +08:00
joeshih
a025eb2b35 Support Vibrate for calls in Settings Slices
Use TogglePreferenceController instead of AbstractPreferenceController
for VibrateWhenRingPreferenceControllr

Bug:74915140
Test: make RunSettingsRoboTests
Change-Id: Ib06126324516826411a7d50a2bd8a790bfd477c7
Merged-In: I501a1470da7dc1ff582c2a90b5235b25036caefc
2018-05-16 11:36:45 +08:00
TreeHugger Robot
e6f66a3c9a Merge "Gets rid of dividers in sound settings" into pi-dev 2018-05-15 13:16:22 +00:00
TreeHugger Robot
7fe599f542 Merge "Add cancel button for private dns dialog" into pi-dev 2018-05-14 21:29:09 +00:00
Beverly
07724bdb18 Gets rid of dividers in sound settings
Change-Id: I71a5e37a48cb6366a161ccc6cf456960f1491eec
Fixes:79480349
Test: visual inspection (Settings > Sound)
2018-05-14 17:13:43 -04:00
Lei Yu
231fe615cc Add cancel button for private dns dialog
Also update the onclick method.

Change-Id: I69e92584e056a4d0a686153315b8df002d91e204
Fixes: 79479021
Test: RunSettingsRoboTests
2018-05-14 13:12:00 -07:00
TreeHugger Robot
cc31240f28 Merge "Remove developer menu: AVDTP delay reports/inband ringing" into pi-dev 2018-05-14 18:20:29 +00:00
TreeHugger Robot
8e27fc7583 Merge "DO NOT MERGE Always show custom zen vis eff option" into pi-dev 2018-05-14 15:29:12 +00:00
Beverly
f487cb9e0a DO NOT MERGE Always show custom zen vis eff option
+ dnd string edits

Change-Id: I2fcbe6c527b40610f997efacb08049c07b3a6dd7
Bug: 79538038
Bug: 78447976
Test: ZenModeViseffectsCustomPreferenceControllerTest
2018-05-14 14:39:32 +00:00
Hansong Zhang
f4f68c4117 Remove developer menu: AVDTP delay reports/inband ringing
Bluetooth AVDTP delay reports and inband ringing are used by default.
Developer option menu no longer used.

Bug: 79610154
Test: robolectric
Change-Id: I67fe10808151f101fc7e891f75953f8539255026
Merged-In: I67fe10808151f101fc7e891f75953f8539255026
2018-05-12 00:22:16 +00:00
Doris Ling
4af11079e8 Merge "Update the initial expanded count for apps and notifications." into pi-dev 2018-05-11 23:33:36 +00:00
Doris Ling
362d783a17 Update the initial expanded count for apps and notifications.
- increase it by 1 to accomodate the injected setting.

Change-Id: I0e131c87ffbf2b296b66717b2c6f160abb3b3269
Fixes: 77823915
Test: visual
2018-05-11 14:37:55 -07:00
Ryan Lin
b46389a588 Merge "Add call volume in sound settings" into pi-dev 2018-05-11 20:13:16 +00:00