Commit Graph

22 Commits

Author SHA1 Message Date
Tony Mak
007dc1abe6 Show RingtonePickerActivity in work user instead
Test: make RunSettingsRoboTests
Test: Try to import custom ringtone in work profile, no crash observed
Test: Set the custom ringtone as default. Tested both work gmail and
      calendar can play that ringtone.
Test: Try to import the peresonal ringtone, it is still working.

Bug: 37197930
Change-Id: I2b662247d7e70b59bae08e082e9682d74d797484
2017-04-12 15:12:44 +01:00
Doris Ling
df4c67cc69 Update Sound settings.
- change the summary to show the automatic rules info instead.
- removed ringtone preference category
- add dividers above DND and Emergency broadcast

Change-Id: Iee497d194b70af72cfd69b315d639ca62720643b
Fix: 34975939
Test: make RunSettingsRoboTests
2017-03-24 15:46:09 -07:00
Fan Zhang
dc9a82f5b0 Fix a crash when resuming sound setting with AfW on Ryu
Also renamed a few xmls

Change-Id: I8ff5a778a39ea45471a27048be4ea2f21075872a
Fix: 36357493
Test: make RunSettingsRoboTests
2017-03-16 11:26:33 -07:00
Fan Zhang
3515cc8217 Refactor sound setting -> work profile initialization logic.
- Some formatting change
- Merge work profile sound settings into main sound setting xml file, and
  use existing WorkCategory to host it. This category automatically hides
  everything within if user is not using work profile.
- Remove logic for manually populating work profile sound setting into
  the UI, thus removing the animation glitch when expanding advanced
  button.

Change-Id: I90459e5cd1d3d20a97ea3629e143ebf13dbd0f76
Fix: 35959624
Test: make RunSettingsRoboTests
2017-03-09 17:49:54 -08:00
Fan Zhang
b00811da64 Let fragment and indexProvider share prefControllers
Bug: 35812240
Test: make RunSettingsRoboTests
Change-Id: Ifd96f935836a52e0a56f170f3cdf9b9ddf7c499a
2017-03-01 12:56:58 -08:00
Doris Ling
4731167500 Remove old code from SoundSettings not used in new IA.
- remove the old sound settings xml
- merge Sound Dashboard metadata into SiybdSettingsActivity instead
and remove Sound Dashboard.
- remove OtherSoundSettings

Bug: 35764802
Test: make RunSettingsRoboTests
Change-Id: I25bb94b375cfe0277b3c961e4bee6fec9a14fb98
2017-02-28 14:02:54 -08:00
Doris Ling
8a7504eb12 Modify test cases according to change in remove preference behavior.
Bug: 35365702
Test: make RunSettingsRoboTests
Change-Id: I541f4bd946116c766a90da955c11933a5499fa93
2017-02-16 16:45:27 -08:00
Doris Ling
4d8a9bd879 Update texts for Settings->Sound->Do not disturb
- Update title to "Do not disturb preferences"
- Add summary text to reflect the priority only allows preferences
- Refactor the summary handling in ZenModeSettings so that the
  controller can get the summary text

Fix: 34975939
Test: make RunSettingsRoboTests

Change-Id: I3ca1dc43fe1d943735a9f625e66c89708a18300a
2017-02-15 13:53:10 -08:00
Robin Lee
9b4309b145 Add another work sounds test
This was removed when fixing the 4 broken tests. Here it is again to get
the coverage back to where it was, using mAudioHelper to get the profile
unlocked state this time instead of UserManager directly (where this is
a hidden API, so not something robolectric supports)

Test: make RunSettingsRoboTests
Change-Id: I8bd383ea8a899004a6208968911d60df9b3b17bc
2017-02-02 17:08:05 +00:00
Robin Lee
805d59dc1d Fix 4 broken work profile tests
Commit 2953f31b61 skipped
RunSettingsRoboTests. The tests started failing because
WorkSoundPreferenceController calls UserManager.isUserUnlocked(int) now
which is not implemented in robolectric.

Fixed by adding a wrapper method to AudioHelper.

Fix: 34819603
Test: make RunSettingsRoboTests
Change-Id: Ia79cc4def9442706752f7e7b9a895ffa8150fd9d
2017-01-31 00:08:52 +00:00
Maurice Lam
f04ff76af0 Suppress failing Settings Robolectric tests
- Assume API 24 for some settings robolectric tests since they are
broken by referencing API new in version 24. Those tests will be
ignored until Robolectric is updated to support SDK 24.

- Comment out failing DatabaseIndexingManagerTest.

Test: cd tests/robotests && mma
Change-Id: Id71211b7a6836d55f31524c4cfe9628c2de78097
2017-01-28 13:10:14 -08:00
TreeHugger Robot
2f2d982f67 Merge "[Sound Settings] Act on managed user added/removed" 2017-01-20 18:31:41 +00:00
Andre Lago
e474bd5f0f [Sound Settings] Act on managed user added/removed
Use the new callbacks for managed profile being added/removed to update
visibility of work sound settings

Test: make RunSettingsRoboTests
Bug: 31701003

Change-Id: I3167e52102bcf9f18a58e85dd9c3117691c6ad3f
2017-01-19 11:48:20 +00:00
TreeHugger Robot
16f1fc66c2 Merge "Tron metrics for special permissions" 2017-01-18 20:27:49 +00:00
Fyodor Kupolov
2328946b58 Tron metrics for special permissions
Added tron metrics for the following special permissions:
Battery optimisation
 - APP_SPECIAL_PERMISSION_BATTERY_ALLOW
 - APP_SPECIAL_PERMISSION_BATTERY_DENY
Device administrators
 - APP_SPECIAL_PERMISSION_ADMIN_ALLOW (when checked)
 - APP_SPECIAL_PERMISSION_ADMIN_DENY (when unchecked)
Do not disturb access
 - APP_SPECIAL_PERMISSION_DND_ALLOW
 - APP_SPECIAL_PERMISSION_DND_DENY
Daw over other apps
 - APP_SPECIAL_PERMISSION_APPDRAW_ALLOW
 - APP_SPECIAL_PERMISSION_APPDRAW_DENY
VR helper services
 - APP_SPECIAL_PERMISSION_VRHELPER_ALLOW
 - APP_SPECIAL_PERMISSION_VRHELPER_DENY
Modify system settings
 - APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW
 - APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY
Notification access
 - APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW
 - APP_SPECIAL_PERMISSION_NOTIVIEW_DENY
Premium SMS access
 - APP_SPECIAL_PERMISSION_PREMIUM_SMS_ALWAYS_ALLOW
 - APP_SPECIAL_PERMISSION_PREMIUM_SMS_ASK
 - APP_SPECIAL_PERMISSION_PREMIUM_SMS_DENY
Unrestricted data access
 - APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW
 - APP_SPECIAL_PERMISSION_UNL_DATA_DENY
Usage access
 - APP_SPECIAL_PERMISSION_USAGE_VIEW_ALLOW
 - APP_SPECIAL_PERMISSION_USAGE_VIEW_DENY

Test: Manual + make RunSettingsRoboTests
Bug: 31008660
Change-Id: Id977e2c9f5aa811a2b0af036372b72c684621435
2017-01-18 10:54:19 -08:00
Doris Ling
3ca367757b Add items in Other Sound directly into Sound settings.
- In new IA, Other Sound no longer is a separate preference screen, but
individual preferences are put directly under SoundSettings.

- Add controllers for each other sounds preference.

- Remove Cast settings from Soundsettings in new IA.

Change-Id: I75d771674ffabfecbd66079bc86844b2ff098b71
Fix: 33944294
Test: make RunSettingsRoboTests
2017-01-11 18:07:15 -08:00
jackqdyulei
d2c0eef222 Add suppressor text in SummaryProvider of Sound when it exists.
When suppressor exists for the sound effect, the sound summary
should show "muted by ...", not the "Ring volume at ..."

Bug: 31461022
Test: make -j40 RunSettingsRoboTests
Change-Id: I5d6895a7a330c993aac40bdca3bb1c79f8b7fbfe
2017-01-03 09:32:18 -08:00
Fan Zhang
43ce3c0a57 Don't convert string to lower case in zen mode pref summary
Change-Id: Ibddf6d70b71cfd88b9de70feb12c2a3f01e31b18
Fixes: 32195605
Test: RunSettingsRoboTests
2016-12-20 14:32:26 -08:00
Doris Ling
2adb6ea4ec Refactor Work sounds in SoundSettings.
- final round of refactoring SoundSettings to use preference
  controller.
- add work sound controller to control all the work profile sound
  settings.

Change-Id: Ifa9f9c1f717ca292576f077311fe284325e12651
Fixes: 32276590
Test: make RunSettingsRoboTests
2016-12-15 14:53:27 -08:00
Doris Ling
6c2cf0dbc5 Refactor SoundSettings to use more preference controller.
- second round of refactoring SoundSettings to use preference
  controller.
- add controller for Emergency broadcast, Vibrate when ring, Phone
  ringtone, Alarm ringtone, and Notification ringtone.

Bug: 32276590
Test: make RunSettingsRoboTests
Change-Id: Iaff48ecb27bf156a5c8995de20ce7a440b094cdb
2016-12-07 14:33:13 -08:00
Doris Ling
1b3ec04748 Update SoundSettings to extend DashboardFragment.
- initial round of refactoring SoundSettings to use DashboardFragment.
- add controller for Cast, Do not disturb, Alarm volume, Media volume,
  Ring volume and Notification volume.

Bug: 32276590
Test: make RunSettingsRoboTests
Change-Id: I5c02a344bff5117bfce93d7ccac650fccc82d2b0
2016-12-01 17:24:05 -08:00
Fan Zhang
f83ce92aaf Update Notification preferences UI in new IA.
- Refactored ConfigureNotificationSettings to be more modular
- And tests

Bug: 31799948
Test: RunSettingsRoboTests
Change-Id: I2ecd8930a6aa501c1e625cab6ed25a46f3437e85
2016-10-24 13:33:14 -07:00