Commit Graph

244 Commits

Author SHA1 Message Date
Julia Reynolds
560e175ade Merge "Prevent oem locked and default apps from being blocked" 2019-03-29 15:25:58 +00:00
Julia Reynolds
4e48da99a9 Move bubble settings to their own page
To make room for graphics/longer descriptive text

Test: robotests
Bug: 129068779
Change-Id: Iac6ea43bd3a0cddc487ff3d1bbd8f35142294d01
2019-03-28 21:25:05 +00:00
Julia Reynolds
bd2bb06567 Prevent oem locked and default apps from being blocked
Test: robotests
Fixes: 129358763
Change-Id: I999b017f9f7389424e499a44cfac43711acbbbea
2019-03-28 16:42:13 -04:00
Julia Reynolds
ca974ae0f4 Launch correct tone picker for audio attributes
Test: robotests
Fixes: 129353516
Change-Id: Iacbf5008f186e59377e534da747544d33a20f81f
2019-03-27 15:22:53 +00:00
jackqdyulei
4dbcdd632f Fix broken settings tests
1. Mark a few as Ignore with bug number
2. Remove some tests since it is covered in other places
3. Fix some tests

I think we should make tests at least green asap.

Bug: 129159331
Test: RunSettingsRoboTests
Change-Id: I90971b416806e4e9be249b06ad5abfb73d9d7c23
2019-03-25 15:54:47 -07:00
Julia Reynolds
f7b793f808 Merge "Add settings for individual NAS components" 2019-03-21 13:09:00 +00:00
Julia Reynolds
05eff1c6a7 Add settings for individual NAS components
Test: robotest
Bug: 127825514
Change-Id: I4359bb548d10b39652bb8c263fa685d595d7a9ea
2019-03-20 09:26:46 -04:00
Fan Zhang
5bb2a87b7f Create a page to manage dnd permission for individual app
- Change the original ZenAccessPage to
  - Remove the inline switch
  - Make the preference click target go into the new detail page
  - Some formatting/style change.

- Create a new detail page for zen access.
  - Exit if app didn't declare this permission
  - Preset the switch toggle to their current permission grant state
  - Move the warning dialog logic from ZenAccessSettings to here.

- Move some common functionality into ZenAccessController, a static
  helper class

Bug: 128547723
Test: robotest
Change-Id: I1ebb32396869d07ff4283b300bd716506298c9b5
2019-03-18 14:42:31 -07:00
Hyundo Moon
eecf8a55fd Merge "Remove ControllerLink" 2019-03-18 10:03:07 +00:00
TreeHugger Robot
8c3fb57ea3 Merge "Fix channel configurability check" 2019-03-15 21:57:23 +00:00
Julia Reynolds
9c6f1aa74b Fix channel configurability check
Test: atest
Fixes: 128669244
Change-Id: Ib4bc666262426ea1fb8fc034a361c93bdd5afb36
2019-03-15 17:19:02 +00:00
Julia Reynolds
4253be9191 Update design of channel pages.
Test: atest
Bug: 127796543
Change-Id: I4fabeafe2602c341554959303e67bc69c8817a8f
2019-03-15 10:21:24 -04:00
Hyundo Moon
da73f26923 Remove ControllerLink
Bug: 128591619
Test: atest com.android.settings.notification.RemoteVolumePreferenceControllerTest
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
      atest CtsMediaTestCases:android.media.cts.MediaBrowserTest;
      atest CtsMediaTestCases:android.media.cts.MediaSessionManagerTest;
Change-Id: I4a975f8a24aaa4e5beb54515f3319f9597b76eb5
2019-03-15 15:07:09 +09:00
Raff Tsai
fe86a2a51f Do not allow draw on top for App notification settings
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
2019-03-08 16:19:30 +08:00
Edgar Wang
5cbdce4b3f Fix Robo test fail at NotificationAssistantPickerTest
Fixes: 127764177
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NotificationAssistantPickerTest
Change-Id: I923a8c948c432fbb0b581a84f058a6d6bd0f7946
2019-03-07 18:59:55 +08:00
Lei Yu
6ebd2ed731 Merge changes from topic "add_cast_volume"
* changes:
  Add SliceWorker for remote volume controller
  Add remote volume slider to sound settings
2019-03-06 23:59:44 +00:00
jackqdyulei
dd00274967 Add SliceWorker for remote volume controller
Also update some methods to fix issues in panel.

Bug: 126199571
Test: RunSettingsRoboTests
Change-Id: I9b93ae594d41cb71b984b06267161455373bf121
2019-03-06 11:31:40 -08:00
jackqdyulei
f25c9b0efc Add remote volume slider to sound settings
1. Add RemoteVolumePreferenceController to control volume through
MediaSessions.
2. Add related preference to skip calling AudioManager.

Bug: 126199571
Test: RunSettingsRoboTests
Change-Id: I9cb85ccf5f49be6d127cb61caf445b2ee7dfb579
2019-02-28 10:50:05 -08:00
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