Commit Graph

459 Commits

Author SHA1 Message Date
Julia Reynolds
a1c0dc75cd Properly show conversation settings
... when the backing shortcut is missing, so users can change
notification settings when the shortcut hasn't yet been recreated by the
app when setting up a new device

Test: Robotests (confirmed that the 2 controllers that used
mConversationInfo already tested for null), manual
Fixes: 203991823

Change-Id: I477c6b0aef0d978767788cbfc1bfadea4d36cda8
2021-11-10 14:16:42 -05:00
TreeHugger Robot
bf6c779caa Merge "Fix broken tests" 2021-11-08 17:16:46 +00:00
TreeHugger Robot
7e94a9ff62 Merge "Check if pref is disabled by admin" into sc-v2-dev am: 87b3974dfd am: cd467e99d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16199770

Change-Id: Ib57d1de7591e1429440f746839078594fd97dfef
2021-11-08 16:50:47 +00:00
Julia Reynolds
dc18e85e41 Fix broken tests
Remove group conditions - we don't have a group page
and so don't need to test what its header would be

Test: this
Fixes: 201021319
Change-Id: I22049bc7ea2153a574ed5aa5428a5dfb295447a5
2021-11-08 16:16:48 +00:00
Julia Reynolds
42896d7fe1 Check if pref is disabled by admin
Test: robotests
Fixes: 137638270
Change-Id: I39953d5b7466281cff7a9a7ffaeb5ba99ab12934
2021-11-05 18:07:58 +00:00
Julia Reynolds
a024c10517 Migrate to using fixed permissions
When deciding which app/group/channel level fields are editable. If
an app has a fixed notification permission, no importance type fields
(including blocking, importance, minimizing, popping on screen, or
prioirty conversions) can be edited.

Test: Robotests
Bug: 194833441
Change-Id: Idc198ea05cd2ab6e43387ae4e8290f446ccfa0c6
2021-10-29 11:27:01 -04:00
TreeHugger Robot
2933fa1efe Merge "Clear up unused code" 2021-10-18 18:13:07 +00:00
Yuri Lin
8cab46f57a Merge "Merge messages & conversations settings for DND priority senders." 2021-10-18 15:03:27 +00:00
Julia Reynolds
b60116fa55 Clear up unused code
Test: make
Bug: 194833441
Change-Id: Icff8fe689626a6e92a119f9ed1a58656d15fbb47
2021-10-15 14:27:17 -04:00
TreeHugger Robot
5f722aaa18 Merge "[Settings] Ignore failed test case" 2021-09-24 07:35:11 +00:00
Bonian Chen
9750adc741 [Settings] Ignore failed test case
Ignore failed test case.

Bug: 201021324
Test: build pass
Change-Id: Iba66fa293ad38b1e6aff45acff0605afeefded7b
2021-09-24 12:48:38 +08:00
Bonian Chen
4cfbbda57f [Settings] Ignore failed test case
Ignore failed test case.

Bug: 201021319
Test: build pass
Change-Id: Ia111ee8fe87e91434b9ef838da7e22699590db19
2021-09-24 12:48:24 +08:00
Eric Laurent
738a621933 Merge "Fix error prone build with spatial audio settings test" into sc-v2-dev am: eb79498e0f am: 1ad39d5015
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15879873

Change-Id: Ida1af01b2df258b9630fc979e7db247490db297b
2021-09-23 15:01:16 +00:00
Eric Laurent
bab4074204 Fix error prone build with spatial audio settings test
Add cast when getting AudioManager per
https://errorprone.info/bugpattern/MockitoCast

Bug: 191870827
Test: make
Change-Id: Icf93e68ec373f9ce145440f97fbe8d02c1716983
2021-09-23 09:52:10 +02:00
TreeHugger Robot
58edb69d46 Merge "Add the Spatial audio toggle in SoundSettings" into sc-v2-dev am: a448a917eb am: edc5e940ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15884455

Change-Id: Iedbf25f530937ae35e7b772873df994036c1d237
2021-09-23 06:55:21 +00:00
Alan Huang
e303658f0d Add the Spatial audio toggle in SoundSettings
The Spatial audio toggle will be showed only on supported devices

Test: robotest, manual checked the UI, but not the actual functionality due to
doesn't have supported device in hand

Bug: 191870827
Change-Id: I7db264902b03fddb7808676d8cb98cbe045deda1
2021-09-23 04:45:46 +00:00
Yuri Lin
00d824657d Merge messages & conversations settings for DND priority senders.
This change explicitly allows for multiselect between priority senders (starred, contacts) & priority conversations, and also allows unchecking boxes by clicking on the same ones again.

Also makes the screens for setting messages and calls in custom rules consistent in behavior with the main DND settings. Since much of the functionality is shared, this change refactors most of the logic into a new helper class used by both.

While these changes also affect how the "calls" screen is constructed, in effect there is no change to the functionality of priority call sender settings except under the hood.

Test: atest ZenPrioritySendersHelperTest; Settings robotests
Bug: 190180868
Bug: 197223270
Change-Id: I894775537a18feb7a891b2668b9a613a203a129c
2021-09-21 15:00:16 -04:00
TreeHugger Robot
03a9dfe57f Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c am: 597ca951a9 am: fb60c7664f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: If8185fd1c7cfca44264e3339b87b3cae3fd574e1
2021-08-13 05:53:35 +00:00
Julia Reynolds
2ffbb747d4 Handle spanned conversation labels
Test: Robotests
Fixes: 194446117
Change-Id: If21f727e00b181f0da127b09e5a1c46ec3257836
2021-08-12 20:11:00 +00:00
Yuri Lin
e9f13fbd5e Rename RadioButtonPreference -> SelectorWithWidgetPreference.
This change is to reduce ambiguity as we're adding the option to style the preference like a checkbox as well.

Bug: 190180868
Test: SelectorWithWidgetPreferenceTest, RunSettingsLibRoboTests
Change-Id: Ie414347bf67ed394ef495604890c5851fc42dbc7
2021-07-20 17:01:21 -04:00
Julia Reynolds
6a603e7f4b Clean up notification settings
- Reorganize settings
- Fix dividers
- Add icons
- Fix titles
- Fix colors
- Fix indentation
- Add summaries

Fixes: 190079590
Test: manual inspection, robotests

Change-Id: Ia03219575d3b0c78f9f9b088aa3cdaa29cfdf412
2021-06-18 14:36:20 -04:00
Julia Reynolds
393134f9b1 Validate config activities with their rule owners
Test: RoboTests
Bug: 189332346
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
2021-06-16 15:40:34 -04:00
Julia Reynolds
a2c2889c78 Merge "Update method name" into sc-dev 2021-06-09 17:33:23 +00:00
Julia Reynolds
b70d3d5c13 Update method name
Test: RoboTests
Bug: 184709662
Change-Id: I3a998a151f9647efae00909e2b4f88fa27d645eb
2021-06-09 09:53:09 -04:00
Giuliano Procida
ef0e09f7a3 Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev 2021-06-08 09:55:58 +00:00
Edgar Wang
cdff5c6ceb Revert "Apply SettingsLib SeekBarPreference to Settings"
Revert submission 13422386-seekbar-sc-dev

Reason for revert: build broken in SettingsGoogle
Reverted Changes:
I0c2d0d5fb:Apply SettingsLib SeekBarPreference to SettingsGoo...
I1844bb3b0:Apply SettingsLib SeekBarPreference to a11y vibrat...
Ia3e4adec8:Apply SettingsLib SeekBarPreference to a11y vibrat...
Iadee57e9d:Apply SettingsLib SeekBarPreference to a11y vibrat...
I219878716:Apply SettingsLib SeekBarPreference to Settings
I959f5672c:Create SettingsLibSeekBarPreference
I92545a69c:Apply SettingsLib SeekBarPreference to a11y vibrat...

Change-Id: Ie6c3b0dc072e044796abdb33fca305f9f9d47c4d
Bug: 176818438
2021-06-08 09:47:51 +00:00
Edgar Wang
4aad4a88a7 Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev 2021-06-08 07:23:54 +00:00
Edgar Wang
d6b5bbb5cb Apply SettingsLib SeekBarPreference to Settings
Bug: 176818438
Test: robotest

Change-Id: I219878716457ce4bb7cad251bccf5d50d93030a5
2021-06-07 18:09:19 +00:00
TreeHugger Robot
5484fd3060 Merge "Revert DND toggle back to a button" into sc-dev 2021-06-07 13:40:54 +00:00
Chloris Kuo
5028e6e6a6 Fix NotificationAssistantPreferenceController constructor
Fix flaky test due to the constructor must either only take Context, or
(Context, String).

Bug: 187998873
Test: CodeInspectionTest, NotificationAssistantPreferenceControllerTest
Change-Id: Ie383ea6773afda05adfb7aa9d7de9e27676f6b29
2021-06-04 11:39:36 -07:00
Chloris Kuo
52ee33df19 Fix flaky NotificationAssistantPreferenceControllerTest
Fix test failures due to we set the Settings.Secure.NAS_SETTINGS_UPDATED
in NMS instead of in NotificationAssistantPreferenceController. Move
some tests to NotificationManagerServiceTest (in another CL)

Bug: 187999823
Test: make RunSettingsRoboTests
Change-Id: Ibfbaa2c8c15e49a14a7faeda50ec044f62b2fe72
2021-06-02 20:06:55 -07:00
Julia Reynolds
eb838f2eef Revert DND toggle back to a button
Test: manual, Robotests
Fixes: 188616179
Change-Id: I70b469ff6ef809056c9eceec7f87f91aed9a23ca
2021-06-02 11:31:59 -04:00
Julia Reynolds
e81b8275a8 Consolidate app notification setting prefs
Test: manual
Fixes: 189201867
Change-Id: If5cc03e0bd2d4273cd842e097b99b15d1178f3dc
2021-05-25 11:57:06 -04:00
Yanting Yang
beb14dbfbc Remove silky flag from Sound for official release
Remove the silky condition and clean up redundant files.

Bug: 183670633
Test: robotests & visual with turning on/off silky home
Change-Id: Ica8217b3921235c9e79cf8f8b531637180552f3b
2021-05-25 06:05:00 +08:00
Julia Reynolds
748b61ce2e Fix NPE on guest user
Test: RoboTests
Fixes: 187548511
Change-Id: I86219bc5e2cf285fcc86f5c8456d7d2afcbe2c0f
2021-05-11 15:08:57 -04:00
Julia Reynolds
540ad99d88 Fix work profile setting appearing too often
That is, when the user didn't have work profile

Test: robotests, manual
Fixes: 187520760
Change-Id: I9394359a6bc278d58ef13b30f8ce99cbaa595c25
2021-05-07 15:02:54 -04:00
Stanley Wang
9b906cb5b6 Use MainSwitchPreference on Bubbles, Screen Saver and
One-Handed mode pages.

Fixes: 178679876
Fixes: 177968619
Test: robotest and see the UIs.
Change-Id: Ic62c7464a71e5410ece5d1db7578c522e1babedc
2021-05-04 19:31:29 +08:00
Julia Reynolds
9d77efb7e7 Merge "Move preference loading to a background thread" into sc-dev 2021-04-24 00:34:26 +00:00
Julia Reynolds
aee53bc98d Move preference loading to a background thread
To improve the loading time of the Notifications screen. Also introduce
placeholder preferences to minimize jank when the data becomes available

Test: Robotests, adb shell am start -W -a android.settings.NOTIFICATION_SETTINGS
Fixes: 185877371
Change-Id: Id63469fdb42e1a66468f2c5f1da8c366686f06e4
2021-04-23 19:48:02 +00:00
Julia Reynolds
16861ac068 Merge "Add enterprise popup to notif lockscreen settings" into sc-dev 2021-04-23 14:46:19 +00:00
Julia Reynolds
e6fbc5877e Add enterprise popup to notif lockscreen settings
Test: Robotests, manual with TestDPC
Fixes: 137638270
Change-Id: I22c492d1455cd0a3b6036333cd51a13d87d8a475
2021-04-22 14:55:26 -04:00
Chloris Kuo
f06f289a85 NAS setting migration
Cancel onboarding notification when user migrates from settings

Test: make RunSettingsRoboTests
Bug: 185428329
Change-Id: I8b6b2eb8340442907c363e686bbd0b32b62d0db0
2021-04-20 19:03:56 -07:00
Mady Mellor
2affde3202 Merge "Change bubble settings to use Secure rather than Global" into sc-dev 2021-04-20 23:06:40 +00:00
Mady Mellor
24adce034d Change bubble settings to use Secure rather than Global
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Bug: 173408780
Change-Id: I53fcd59c22c219551bd2eb6f0251acb5a03690ea
2021-04-20 01:37:34 +00:00
Chloris Kuo
d37f0faf0d NAS settings change
Handle migration for multi-profiles

Test: make RunSettingsRoboTests
Bug: 185623118
Change-Id: I392b420b849a329e3e24d8e8dcf0b84a63d37799
2021-04-19 00:14:49 -07:00
Chloris Kuo
2c955bbae2 NAS Setting Migration
Change NAS setting to a toggle setting and move the settings to
Notifications/General

Bug: 173106358
Test: tested manually on device, make RunSettingsRoboTests
Change-Id: I1ba1214511dceea6faf5fb39692d920e761b33d8
2021-04-10 18:22:44 -07:00
Yanting Yang
6ef0b34a32 Merge "Make work profile sounds section as its own entry" into sc-dev 2021-03-31 08:08:41 +00:00
Yanting Yang
e14a3a3022 Make work profile sounds section as its own entry
Also rephrase the strings by request.

Bug: 174964721
Test: manual
Change-Id: I760249cd48832f2739ab7ca33706cd11dd34a6b5
2021-03-30 22:37:01 +08:00
Julia Reynolds
4b301dba7a Fix some 'clear recent issues'
- Don't show the button if nothing is clearable
- Optimistically remove preferences on pressing clear since the actualy
clear action is asynchronous

Test: RoboTests
Fixes: 178765511
Change-Id: Ic305d4d199b149078ea52a614cb93cebe55cd245
2021-03-29 17:43:31 -04:00
Julia Reynolds
ddf1958bdc Update NLS listing page
- Organized by allowed/not allowed
- Include paired devices if there are any

Test: settings robotests
Fixes: 181125174
Change-Id: Id64ee0ebd9b40a92d54a03d92fec3ff0bb3b926d
2021-03-04 20:54:10 +00:00