Commit Graph

226 Commits

Author SHA1 Message Date
Fan Zhang
f1b5989706 Guard NPE in RingtonePrefController
Fixes: 126416474
Test: robotests
Change-Id: I02d0279ae107e7c03668849beaea8aa0463b4da6
2019-02-26 15:45:17 -08:00
Fabian Kozynski
d565d7a505 Add summary to Notification Assistant picker
Test: manual
Test: atest
Fixes: 126200103
Change-Id: I9569ca7dd58184242fe740e3db63bd7958042cfb
2019-02-25 15:52:40 -05:00
Fabian Kozynski
01b2a635e9 Create settings screen for Notification Assistant
Test: this atest
Test: manual: change assistant and "adb shell dumpsys notification"
Test: manual: verify persistance through reboot (including none)

Fixes:120852765
Change-Id: Ie4516c3339246d66d7b6719ac5dd1d65c4d03b57
2019-02-22 14:05:18 -05:00
Julia Reynolds
14289bd356 Add pref for notification swipe direction
And move that and other settings under an 'advanced' category

Test: robotests
Fixes: 124099692
Change-Id: I89df276a8bc1cd56ce8530239ca02b2c4b43fa65
2019-02-20 10:36:50 -05:00
Julia Reynolds
7d257171dc Merge "Fix failing test" 2019-02-08 17:53:43 +00:00
Julia Reynolds
d8629c5ebb Fix failing test
Test: robo tests
Change-Id: Ic4c927948b3c91a126ab830960e12550a5fd80fa
Fixes: 124077441
2019-02-08 10:49:11 -05:00
Joel Galenson
a330abba0a Fix broken tests.
This test was passing in invalid values for the namespace and key.
Modify it to use the correct ones.

Change-Id: Idc6971c20d64b711953bdde9fe710f592b04e807
Fixes: 124077137
Test: atest VibrateWhenRingPreferenceControllerTest
2019-02-07 19:36:21 -08:00
Julia Reynolds
0c45775a5d Add settings for notification bubbling
Globally, as well as at the app and channel level

Test: atest
Bug: 123543052
Change-Id: I1668b592c5d175d77d6a38f35e7576d641175d44
2019-02-04 18:08:41 -05:00
Julia Reynolds
12cec79889 Merge "More tests for silent status bar setting" 2019-02-01 20:37:41 +00:00
Tajinder Gadh
eb1aa063ed If the ramping ringer adaptive volume is enabled then do not show
this setting. It will be injected from settings intelligence with
additional user options

Test: Build locally and validated
Change-Id: I6f79eea460e86d643d92c04e8ea126b99b9bed8b
2019-01-31 03:48:46 +00:00
Julia Reynolds
f74ff06731 More tests for silent status bar setting
Test: this
Change-Id: I2f1890a4843438684c089b837cf74bd520b352e6
Fixes: 123419917
2019-01-30 12:55:00 -05:00
Julia Reynolds
6d905451bf Merge "Add silent status bar icon setting" 2019-01-30 13:41:08 +00:00
Daniel Sandler
30f0643c9e Merge "Fix dsandler's email address." 2019-01-30 02:09:54 +00:00
Julia Reynolds
c04425fe38 Add silent status bar icon setting
Test: atest
Bug: 123419917
Change-Id: I40fe580b76589c45a70365c09a966a76b5bc882b
2019-01-30 00:41:51 +00:00
Dan Sandler
3d0078766d Fix dsandler's email address.
Test: dsandler can give OWNERS approval again
Change-Id: I8a59453ec95b98ce74703bbe003c9039e2a96f22
2019-01-29 14:41:54 -05:00
Fan Zhang
c52a581bb7 Clean up ShadowUserManager
Remove addManagedUser() and use default shadow for the same purpose.

Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=Redaction
Change-Id: I2f86bd51bccbde23a8a37d19b28e30cadb2b9f93
2019-01-28 16:32:56 -08:00
Julia Reynolds
e88f7ab7a7 Update appearance of channel preferences
Test: atest
Change-Id: Ie58e7a27601ee23b1cd2caf990cc5c10006c0162
Fixes: 122671854
2019-01-14 13:04:22 -05:00
Yanting Yang
1c9b97d537 Clean up assertion methods in SliceTester
Fixes: 120592507
Test: robotests
Change-Id: Ic20fa96aa500d9ab50ef2adcb59f48c328989ec8
2018-12-27 17:24:36 +08:00
Beverly
b9f38af689 Add custom dnd pages for each dnd auto rule
- Fix strings
- Add zen custom settings dialog when custom settings are being applied
Test: make RunSettingsRoboTests -j40
Bug: 111475013
Fixes: 120787133
Fixes: 120796642
Fixes: 120865472
Change-Id: I34d6b4b23d36277e3704416d65e2418418c124e1
2018-12-20 15:06:01 -05:00
Julia Reynolds
18873b9278 Merge "Link to the appropriate config activity for dnd rules" 2018-12-17 21:08:55 +00:00
Jason Chiu
7aa7ece7a2 Fix build failed of Settings test cases while importing AndroidX
- API change in AndroidX Preference causes a build breakage
- Apply explicit casting for the new API interface

Test: robotest
Fixes: 121109361
Change-Id: If3e7be9e53c7860252523700d6721ae4956db68a
2018-12-17 16:46:42 +08:00
Julia Reynolds
ec84a9367f Link to the appropriate config activity for dnd rules
Test: atest, manual
Bug: 111474881
Change-Id: I0c1d7b14abe3cf65762167f3c412fa8f2be1d842
2018-12-14 14:41:48 -05:00
James Lemieux
f1dade40d2 Use binary resource support in robolectric
The resources available to tests are now exactly the merged resources
located in the APK under test.

Bug: 74359828
Test: make -j56 RunSettingsRoboTests
Change-Id: I050db81a92decefea23314b5ec7a62f77ff4bb2b
2018-12-12 19:53:49 -08:00
Beverly
fdebb9632b Update DND strings
Fixes: 120497233
Bug: 111475013
Test: manually flash and check strings
Test: make RunSettingsRoboTests -j40
Change-Id: I0a8971226a485f8ec41d83c167e51dac1a9c8107
2018-12-05 17:13:49 -05:00
Beverly
6afe8365a9 Update Zen Automatic Rule Settings page
Test: atest ZenModeBackend
Test: make RunSettingsRoboTests
Bug: 111475013
Change-Id: I86cc2c35002cd3a74d21f080eaf6d0fc29fa6a17
2018-12-03 14:17:42 -05:00
tmfang
dce94bb237 Use SettingsLib's LayoutPreference
- Remove LayoutPreference in Settings source code.
- Remove unused style, layout
- Replace old imports to com.android.settingslib.widget.LayoutPreference
- Replace old XML tag to com.android.settingslib.widget.LayoutPreference

Test: robotest, manual test
Bug: 120005054
Change-Id: I9ae1ae14a16f443e11ac5d75b6038c7c5e253844
2018-11-27 13:12:53 +08:00
James Lemieux
1fc96ea98d Prepare tests for impending robolectric merge
Setting's ShadowUserManager.reset() was unnecessary and collided with a
newly introduced reset() method in its super class. It has been removed.

Test: make -j56 RunSettingsGoogleRoboTests &&
  make -j56 RunSettingsRoboTests &&
  make -j56 RunSettingsLibRoboTests

Change-Id: I63c50eca0de3581fd4f64f4862233446f5937d0c
2018-11-19 16:56:40 -08:00
Beverly
7973c635c9 Add new settings page for apps overriding dnd
Close starred contacts cursor

Test: atest ZenModeAllBypassingAppsPreferenceControllerTest
Test: atest ZenModeBypassingAppsPreferenceControllerTest
Bug: 111475013
Change-Id: I84d259aaef1bc5cc907ec5bef08beade91a8b904
2018-11-14 15:56:29 -05:00
Beverly
69d11b2874 Dnd settings pages redesign (round 1)
Test: make RunSettingsRoboTests -j40
Bug: 111475013
Change-Id: Idb6bbfdfe377b61a8fe1f7e81171bbefe23a4ebf
2018-11-01 09:24:46 -04:00
Fan Zhang
cdf284b732 Make Settings robotest work with tot Robolectric
Bug: 116278591
Test: make -j RunSettingsRoboTests
Change-Id: I32cb2fcf6094675f79d2fc24702ef6298a9691e4
2018-10-31 17:59:17 -07:00
Mill Chen
2559f02d68 Clean up unnecessary spy context statements
Remove spy context syntax because we do not need to
mock context anymore in the test cases.

Bug: 117644158
Test: robotests
Change-Id: I222eec4fbc1994d7bb79adead40b76ac0a000bdc
2018-10-12 21:54:02 +08:00
Fan Zhang
2f324c9484 Merge "Remove mocked resources from slice test cases" 2018-10-10 20:13:52 +00:00
Mill Chen
fdf06e242a Remove mocked resources from slice test cases
Clean up some resources which are useless for the moment.

Bug: 117485451
Test: robotests
Change-Id: Id3591178791cc6c9f628a99a8916e9007a399728
2018-10-09 23:25:44 +08:00
Beverly
833119a4e2 Allow DND events rule to choose custom calendars
For the System DND Events rule, users can now select
custom calendars they are contributors to that are
synced to their device.

Test: atest /extra/master/packages/apps/Settings/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java
Bug: 113368047
Change-Id: I1b81c528655b8f68867d881cee8125aa2b027eaa
2018-10-05 14:58:00 -04:00
Julia Reynolds
7217c4421f Prevent non-blockable app from being blocked
In the recent notifications display.

Test: manual
Change-Id: I0b14dfbcb8c4a971bb028def7751d083d37958de
Fixes: 111863327
2018-09-13 14:02:50 -04:00
Philip P. Moltmann
e3f721132a RestrictedLockUtils was split into ...Internal
This means that in some cases RestrictedLockUtils has to be used and in
some RestrictedLockUtilsInternal.

This causes a lot of trivial code changes.

I also updated the ordering of the imports in all affected files.

Bug: 110953302
Test: Built
      make -j RunSettingsRoboTests
Change-Id: I9bdf8b89134f853bae4f38c81af436715c73e924
2018-08-30 08:11:39 -07:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
Beverly
c4d473c613 Use CustomDialogPreferenceCompat for ZenDuration
Test: ZenModeDurationPreferenceControllerTest
Bug: 112041657
Change-Id: I0158a703d26f73512c560889d6549d68230bf98e
2018-08-06 11:41:03 -04:00
Beverly
b00cef308e Use Settings.Secure values, not Global values
The following Settings are being moved to Settings.Secure
from Settings.Global since they are settings that exist
per user
 - CHARGING_SOUNDS_ENABLED
 - CHARGING_VIBRATION_ENABLED
 - ZEN_DURATION
 - SHOW_ZEN_UPGRADE_NOTIFICATION
 - SHOW_ZEN_SETTINGS_SUGGESTION
 - ZEN_SETTINGS_UPDATE
 - ZEN_SETTINGS_SUGGESTION_VIEWED

Bug: 110926544
Test: make ROBOTEST_FILTER=ZenModeDurationPreferenceControllerTest RunSettingsRoboTests
Change-Id: I3e3d6f6653b81a121fbda7d2f9f1b75651f536b7
2018-07-26 16:46:06 -04:00
jackqdyulei
63a5c6f9ab Use SettingsRobolectricTestRunner in settings app
Change-Id: I3682ea52c53ff4fcce7e9aa52a4a6827bb31b2cb
Fixes: 111646366
Test: robotest
2018-07-19 11:21:20 -07:00
tmfang
f12e6adcdc Settings Fragment Migration (Fix test cases)
Fix all Roboletric test cases.
In this CL, some test cases are broken.
So, We ignored these test cases temporarily.

Test: make RunSettingsRoboTests -j56
Bug: 110259478
Change-Id: I1a3075438a614432a2de4f2d96d8abf9a83ce58c
2018-07-11 18:24:51 -07:00
tmfang
99cc23d0da Settings Fragment Migration (Change imports)
This commit *only* changes imports and optimize imports.
We don't do anything else.

This patch can't compile pass and run test case.
We will update other patches to fix these problem.

Change list.

1. import android.app.Fragment; ->
   import androidx.fragment.app.Fragment;
2. import android.app.DialogFragment; ->
   import androidx.fragment.app.DialogFragment;
3. import android.app.ListFragment; ->
   import androidx.fragment.app.ListFragment;
4. import android.app.LoaderManager; ->
   import androidx.loader.app.LoaderManager;
5. import android.content.AsyncTaskLoader; ->
   import androidx.loader.content.AsyncTaskLoader;
6. import android.content.Loader; ->
   import androidx.loader.content.Loader;
7. import android.app.FragmentTransaction; ->
   import androidx.fragment.app.FragmentTransaction;
8. import android.app.FragmentManager; ->
   import androidx.fragment.app.FragmentManager;
9. import android.app.LoaderManager.LoaderCallbacks; ->
    import androidx.loader.app.LoaderManager.LoaderCallbacks;

Bug: 110259478
Test: Can't test it.
Change-Id: I0a3f98fff34a3494a839c3c42aeabcec3df2c8b3
2018-07-11 18:23:51 -07:00
TreeHugger Robot
2fcd7a1cd3 Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." 2018-07-03 20:54:29 +00:00
Pavel Grafov
f14de789f4 Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.
Only primary user can set LOCK_SCREEN_SHOW_NOTIFICATIONS,
profile can only set notifications to be redacted. When the
user changes notification settings for a work app, this class
is invoked from the profile, meaning it attempts to read
LOCK_SCREEN_SHOW_NOTIFICATIONS for the profile, which is not
there. As a result the function always returs 0 for work apps.

Bug: 111112011
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
Change-Id: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
2018-07-03 20:47:08 +01:00
Beverly
0394ab2db0 Use getSummary in ZenStarredContactPrefController
Change-Id: I517d959371e7dde2eafef540fe000f177c064104
Fixes: 110989450
Test: ZenModeStarredContactsPreferenceControllerTest.java
2018-07-02 11:25:02 -04:00
Fan Zhang
7431c91de6 Remove search indexing pipeline from Settings
Index is already handled by SettingsIntelligenec. No longer needed in
Settings.

Change-Id: Id43fb3100dc2759185744441cff8cb9cd2d2da20
Fixes: 69808376
Test: robotests
2018-06-21 09:38:36 -07:00
Fan Zhang
c7162cd24d Reorder and clean up imports.
Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
2018-06-18 15:45:09 -07:00
Julia Reynolds
7b5ef08b81 Add notification sent count to app info
Test: robotests
Bug: 79607096
Change-Id: I6f96ad7890ff8f224749db10fc8a18d4626cac11
2018-06-14 16:25:01 -04:00
Julia Reynolds
8ebfb12cac Add notification sent count to channel settings
Bug: 79607096
Test: robotests
Change-Id: I3c1d8fd1cbd9f5b8e997f1bfd50926121a5040fb
2018-06-14 14:58:59 -04:00
Julia Reynolds
9e2ec5fa07 Hide block pref on non-configurable channels
Test: robotests
Bug: 109875297
Change-Id: I164ae2e07d178db9e84746e5c59f0968e6c77eae
2018-06-07 19:49:49 +00:00