Commit Graph

776 Commits

Author SHA1 Message Date
Jason Chang
a76797e756 [SettingsLib] Update Utils.getColorAccent() and Utils.getColorError() to return ColorStateLists instead of colors.
Update Utils.getColorAccent() and Utils.getColorError() to return ColorStateLists instead of colors and change every callers entry.

Bug: 78215054
Test: manually test for UI
Change-Id: Ie201aee439bd9e8337eca989b4cdc836a6e8e917
2018-05-21 17:23:41 +08:00
Matthew Fritze
097dc80fc1 Add Intentfilter BasePreferenceController
For settings which can change in the framework, outside of
the settings app and a slice, a Slice needs to be able to
register a listener for these changes.

Adding a getter for an IntentFilter in BasePreferenceControllers
allows us to use the SliceBroadcastRelay in SysUi to listen for
these changes.

Test: robotests
Bug: 78138654
Change-Id: Ifa05b651aaa3458c54866f71469964b1a070e458
2018-05-18 08:04:18 -07:00
Matthew Fritze
4710917aa4 Add DnD as a special case Slice
Add DND Slice as a special case, since there is an existing
inheritance structures in the zen mode preference controllers which
would be too risky to change at this point in the release.

Test: make RunSettingsRoboTests
Bug: 67997377
Change-Id: Ice608b9a7bd6f38b73e581eb3723f0a2fae96f2b
2018-05-17 18:20:07 -07:00
TreeHugger Robot
9f31b4803b Merge "Update zen onboarding" 2018-05-16 18:38:41 +00:00
Fan Zhang
7d6539d09b Merge "Support Vibrate for calls in Settings Slices" 2018-05-16 17:22:29 +00:00
hughchen
acb6e89c52 Update DialogFragment UI when BT device is add/remove/rename
* For fix the "Automatic merge failed" in pi-dev, cherry pick the ag/3937781 in
  master. Change android.support.* to androidx.*
* Add AudioSwitchCallback() in AudioSwitchPreferenceController.
  This callback is used to notify SoudSettings to update the dialogFragment UI.
* Add UpdatableListPreferenceDialogFragment that updates the available
  options when dialog is shown
* Add test to verify the adapter count when
  onListPreferenceUpdated() is called.

Bug: 77783217
Test: make -j50 RunSettingsRoboTests
Change-Id: I8cac1b30ec50df026f4b7722dd1cd2f69e77a4cb
2018-05-16 22:13:24 +08:00
Beverly
414b7034f1 Update zen onboarding
- Update text
- Update buttons
- Update style

Fixes: 79702414
Fixes: 78447976
Fixes: 79525632
Test: ZenOnboardingActivityTest
Change-Id: Ied476fc920828409993953fba32bf3dae324ea3c
(cherry picked from commit e3a66fc16d)
2018-05-16 13:40:56 +00:00
Fan Zhang
5de68ea81a Update sound setting icons am: 37a6a91444
am: c3669d8971

Change-Id: Id6d6393f8fb754dd98f756601ddf97d1a5fabf23
2018-05-15 19:05:04 -07:00
Fan Zhang
37a6a91444 Update sound setting icons
- icon for sound setting in Settings homepage
- icon on phone muted condition card
- icon on DND condition card and DND suggestion

Bug: 77982107
Test: visual
Change-Id: I22b5223029d67de0bcb2466a45075835453a2b5f
2018-05-15 15:35:37 -07:00
Beverly
2aa4e12145 Show mute icon in sound settings page
Cherry-picked from pi-dev ag/4057627
- Show mute icon when ringer is muted
- Show vibrate icon when ringer is on vibrate
- Show ringer icon when ringer is on ring

Test: visual inspection
Change-Id: I662e0d4fd33ac2284378c2f558509c93c907fbe3
Fixes: 78330194
2018-05-15 21:54:34 +00:00
Beverly
90ebab0650 DO NOT MERGE Show mute icon in sound settings page
- Show mute icon when ringer is muted
- Show vibrate icon when ringer is on vibrate
- Show ringer icon when ringer is on ring

Test: visual inspection
Change-Id: I662e0d4fd33ac2284378c2f558509c93c907fbe3
Bug: 78330194
2018-05-15 20:35:50 +00:00
joeshih
5d772136e1 Support Vibrate for calls in Settings Slices
Use TogglePreferenceController instead of AbstractPreferenceController
for VibrateWhenRingPreferenceControllr

Bug:74915140
Test: make RunSettingsRoboTests
Change-Id: I501a1470da7dc1ff582c2a90b5235b25036caefc
2018-05-15 12:03:35 +08:00
Beverly
55d6aebcc5 Always show custom zen vis eff option
Cherry-picked from pi-dev ag/4044915
+ dnd string edits

Change-Id: I2fcbe6c527b40610f997efacb08049c07b3a6dd7
Fixes: 79538038
Bug: 78447976
Test: ZenModeViseffectsCustomPreferenceControllerTes
2018-05-14 19:03:40 +00:00
Beverly
8f52258962 Add DND Settings suggestion
Cherry-picked from pi-dev ag/4019736

Test: SettingsSuggestionsTest, ZenOnboardingActivityTest
Change-Id: Ie78c9cf8287ee56bc4596efe20d27f8eb432ab6c
Bug: 78445134
2018-05-14 18:15: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
Ryan Lin
18aa25ea47 Merge "Add call volume in sound settings" into pi-dev am: b46389a588
am: 71b333f162

Change-Id: If69203fa5c4158f609484e6c3bbc0ca5bd6e0f58
2018-05-11 15:44:53 -07:00
Beverly Tai
49499bcb06 Merge "DO NOT MERGE Add DND Settings suggestion" into pi-dev 2018-05-11 20:59:49 +00:00
Beverly
d4e7eedfc9 DO NOT MERGE Add DND Settings suggestion
Test: SettingsSuggestionsTest, ZenOnboardingActivityTest
Change-Id: Ie78c9cf8287ee56bc4596efe20d27f8eb432ab6c
Bug: 78445134
2018-05-11 20:59:38 +00:00
Ryan Lin
b46389a588 Merge "Add call volume in sound settings" into pi-dev 2018-05-11 20:13:16 +00:00
ryanywlin
156fd91fbd Add call volume in sound settings
* Add call volume slider
* move "Take call" controller from "Ring volume" to "Call volume"

Bug: 77254162
Test: make -j50 RunSettingsRoboTests

Change-Id: I3443021c1557f42293e9b7772fe9072e5a966cf8
2018-05-11 17:56:16 +08:00
Beverly
f002dcf43b Add zen starred contacts preference
Bug: 78447976
Test: ZenModeStarredContactsPreferenceControllerTest
Change-Id: Ic9d1b08c3e80832b29ad8e223a34f35e2f763cf9
2018-05-10 18:17:41 -04:00
Beverly
3403c3729e Clear deprecated effects when saving zen policy
- Deprecated effects are set in NotificationManagerService,
so unset them before setting the NotificationPolicy
- When user clicks on Custom, they are brought to the custom vis effects
page instead of resetting custom values to presets

Fixes: 79383781
Test: manual
Test: NotificationManagerServiceTest testSetNotificationPolicy_preP_setOldNewFields
Change-Id: Id6db9ce2aaeed6321389f8dbfbea65eda30c74ad
2018-05-10 13:37:37 -04:00
Julia Reynolds
200da8978f DND settings redesign
Test: robotests
Change-Id: I7b980218feea28e945994c8b7f8a934df6bc11f9
Bug: 78447976
2018-05-10 13:25:35 -04:00
Beverly Tai
60a9ed8627 Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev 2018-05-10 13:28:47 +00:00
TreeHugger Robot
ab68a8107c Merge "Establish permanently unavailable settings" into pi-dev 2018-05-09 21:13:44 +00:00
Beverly
a4d5980869 DO NOT MERGE Add zen starred contacts preference
Bug: 78447976
Test: ZenModeStarredContactsPreferenceControllerTest
Change-Id: Ic9d1b08c3e80832b29ad8e223a34f35e2f763cf9
2018-05-09 16:12:10 -04:00
Beverly
17c6de8e68 DO NOT MERGE Clear deprecated effects when saving zen policy
- Deprecated effects are set in NotificationManagerService,
so unset them before setting the NotificationPolicy
- When user clicks on Custom, they are brought to the custom vis effects
page instead of resetting custom values to presets

Fixes: 79383781
Test: manual
Test: NotificationManagerServiceTest testSetNotificationPolicy_preP_setOldNewFields
Change-Id: Id6db9ce2aaeed6321389f8dbfbea65eda30c74ad
2018-05-09 18:50:48 +00:00
android-build-team Robot
02ec86a17b Merge "Establish permanently unavailable settings" 2018-05-09 18:14:32 +00:00
Matthew Fritze
bd376296cd Establish permanently unavailable settings
Distinguish between settings which are permanently unavailable on
the device, and temporarily unavailable. This enables us to restrict
which setting slices are exposed in onSliceGetDescendants.

The primary changes in this CL are renaming:
"DISABLED_UNSUPPORTED" -> "UNSUPPORTED_ON_DEVICE"
to be more clear the the setting will cannot be accessed on the device, and,
adding a new enum to encapsulate settings which are currently unavailable, but
could be enabled in the future.

Also remove UNAVAILABLE_UNKNOWN. Devs should never need this enum.

Bug: 78910582
Fixes: 79245656
Test: robotests
Change-Id: I42c2cedab66be2d76999795f46470a079cc1ec71
Merged-In: I58821a6cfd6134b3b351657b6edf5f74ead00643
2018-05-09 10:03:40 -07:00
Matthew Fritze
f87a1f3f41 Establish permanently unavailable settings
Distinguish between settings which are permanently unavailable on
the device, and temporarily unavailable. This enables us to restrict
which setting slices are exposed in onSliceGetDescendants.

The primary changes in this CL are renaming:
"DISABLED_UNSUPPORTED" -> "UNSUPPORTED_ON_DEVICE"
to be more clear the the setting will cannot be accessed on the device, and,
adding a new enum to encapsulate settings which are currently unavailable, but
could be enabled in the future.

Also remove UNAVAILABLE_UNKNOWN. Devs should never need this enum.

Bug: 78910582
Bug: 79245656
Test: robotests
Change-Id: I58821a6cfd6134b3b351657b6edf5f74ead00643
2018-05-09 08:36:59 -07:00
hjchangliao
e86eec0c07 Rename SubSettingLauncher.setTitle, add java doc
For make this method usage more clear,
setTitle(charSequence) rename as setTitleText,
add java doc: it is only for user generated string
setTitle(int) rename as setTitleRes.

Change-Id: I972cb6a8ff90873dfdc25c23f6dc3d68103c8e4e
Fixes: 78347436
Test: make RunSettingsRoboTests
2018-05-09 10:00:05 +08:00
android-build-team Robot
714b15cbdf Merge "Use ListFormatter to join strings" 2018-05-08 20:20:28 +00:00
Julia Reynolds
e9211d58d2 Merge "DO NOT MERGE DND settings redesign" into pi-dev 2018-05-07 18:25:52 +00:00
Julia Reynolds
4ad06ac4ba Hide uneccessary dividers am: 99902e1faf
am: 4b9f5c10b1

Change-Id: Icd85a3d4deefe3d48f5fe7699be4d22615722228
2018-05-04 14:40:00 -07:00
Julia Reynolds
99902e1faf Hide uneccessary dividers
Test: manual
Change-Id: I159732e35b88815458786b180438380b280410ff
Fixes: 79256291
2018-05-04 19:13:21 +00:00
Julia Reynolds
cb6fe394d0 DO NOT MERGE DND settings redesign
Test: robotests
Change-Id: I7b980218feea28e945994c8b7f8a934df6bc11f9
Bug: 78447976
2018-05-04 14:45:43 -04:00
android-build-team Robot
7309dddaa3 Merge "Refactor badging notification preference controller." into pi-dev 2018-05-04 05:18:34 +00:00
android-build-team Robot
23474e93f1 Merge "Refactor badging notification preference controller." 2018-05-04 04:17:09 +00:00
Julia Reynolds
6eabafeacd Update onboarding
Change text and add 'repeat callers'

Test: robotests
Change-Id: I4b7125a2a9d70cf5ec7e4d184528a444d7d2bcf1
Fixes: 78448988
2018-05-03 13:10:15 +00:00
Chuck Liao
a7c14d474a Refactor badging notification preference controller.
- Convert inheritance from AbstractPreferenceController to TogglePreferenceController.
- Register BadgingNotificationPreferenceController in XML.
- Add RoboTests test cases for BadgingNotificationPreferenceController.

Fixes: 67997784
Test: RunSettingsRoboTests
Change-Id: If10744c067f065e7c2465ca1fff66895d7dc1c56
Merged-In: If10744c067f065e7c2465ca1fff66895d7dc1c56
2018-05-03 09:35:18 +00:00
Chuck Liao
6f4d440414 Refactor badging notification preference controller.
- Convert inheritance from AbstractPreferenceController to TogglePreferenceController.
- Register BadgingNotificationPreferenceController in XML.
- Add RoboTests test cases for BadgingNotificationPreferenceController.

Fixes: 67997784
Test: RunSettingsRoboTests
Change-Id: If10744c067f065e7c2465ca1fff66895d7dc1c56
2018-05-03 16:50:12 +08:00
Julia Reynolds
d521588510 Merge "DO NOT MERGE Update onboarding" into pi-dev 2018-05-02 13:46:17 +00:00
Eran Messeri
a6d36c4e2e Merge "Require work profile to be unlocked for changing notification settings in a different way" into pi-dev 2018-05-02 13:44:48 +00:00
Julia Reynolds
16bafbbc74 DO NOT MERGE Update onboarding
Change text and add 'repeat callers'

Test: robotests
Change-Id: I4b7125a2a9d70cf5ec7e4d184528a444d7d2bcf1
Fixes: 78448988
2018-05-02 12:28:33 +00:00
jyhshiangwang
4d015b17b3 Use ListFormatter to join strings
Currently in Settings we are using R.string.join_many_items_first, R.string.join_many_items_middle and R.string.join_many_items_last to manually join strings. The join code is messy and the joined string is incorrect in some languages, so we migrate all string join to just use ListFormatter.getInstance().format().

Bug: b/78248791
Test: robotests
Change-Id: I898339978e6e2027587e28994b0280fa46821fd6
2018-05-02 11:15:32 +08:00
android-build-team Robot
c66613306a Merge "Workaround task-resolution bug in AM" into pi-dev am: bb5a46fabd
am: f22e98e7c7

Change-Id: I0c2407144a87accaa8e884b31ecc0af2893b6d6e
2018-05-01 16:21:13 -07:00
android-build-team Robot
bb5a46fabd Merge "Workaround task-resolution bug in AM" into pi-dev 2018-05-01 23:08:15 +00:00
Eran Messeri
f61ccf3fa3 Require work profile to be unlocked for changing notification settings in a different way
Rather than check for the state of the work profile in
LockScreenNotificationPreferenceController#handlePreferenceTreeClick, do so in
the RestrictedListPreference#performClick.
The drawback of checking the state in handlePreferenceTreeClick is that the
preferences are displayed first and then the requirement to unlock/enable the
work profile is displayed on top of it.

This is rather poor UX, so switch to doing the check in performClick and
returning early if the work profile needs to be unlocked/enabled.
This is similar to Patchset 1 from ag/3805482.
The main difference is that the user is returned to the settings screen
both after enabling the work profile and unlocking it.

Test: Manually with TestDPC
Test: atest SettingsRoboTests:RestrictedListPreferenceTest
Bug: 77408805
Merged-In: Id168911b082fffac193cd7c7a658ab92d6ce2c15
Change-Id: I0a3a4ec4dda78e28ee88a11d383eda49e9cf50a6
2018-05-01 21:55:56 +01:00
Eran Messeri
7b36ccdd9b Merge "Require work profile to be unlocked for changing notification settings in a different way" 2018-05-01 20:51:39 +00:00