Commit Graph

522 Commits

Author SHA1 Message Date
Julia Reynolds
37d64387a3 Merge "Show deleted channels." 2017-01-20 14:30:23 +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
Tamas Berghammer
6031fba9f2 DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
am: 5a638a6ad1

Change-Id: If23c0926eecf6a08ed0c0ab174cdddb43e31cc00
2017-01-18 20:24:36 +00:00
Tamas Berghammer
5a638a6ad1 DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
This reverts commit fbd5f5fdce.

Change-Id: I769f7a0f509996ccc39fd1c628cad7e5ec1202bf
2017-01-18 19:28:11 +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
Tamas Berghammer
6cd7e52b9e Update package names to work with the proto3 compiler
am: fbd5f5fdce

Change-Id: I20b3bc10cf66bb94369631cef229787b5e6353b6
2017-01-18 17:45:33 +00:00
Julia Reynolds
b41cf299fe Show deleted channels.
Test: run cts, verify manually in Settings ui
Change-Id: Ib6376decaa4ae427bb706ea48608a5aa8924da2f
2017-01-17 15:01:15 -05: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
Tamas Berghammer
fbd5f5fdce Update package names to work with the proto3 compiler
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit 265d3c2a0c)
2017-01-11 11:28:10 +00:00
Fan Zhang
c4372f1a48 Merge "Only show first 5 items in sound setting until click More." 2017-01-09 17:57:05 +00:00
Fan Zhang
b1ddde17d2 Only show first 5 items in sound setting until click More.
Bug: 32255863
Test: RunSettingsRoboTests
Change-Id: Ib9449b70e2f2a003b3c6a810d0cc03016d025edb
2017-01-07 11:21:11 -08:00
Julia Reynolds
d43440a555 Cannot have badge only channels.
Test: manual
Change-Id: I564f6b7e076a10847bd7f48c59a0de095180ea92
2017-01-06 15:53:52 -05: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
Geoffrey Pitsch
db380fa9cb DO NOT MERGE Fix Notification Settings when unblockable app is blocked.
When an app was blocked in the past, don't hide the controls
so the user is able to unblock the app.  After unblocking, the
controls will be hidden the next time settings is visited.

Bug:32557897
Change-Id: I7ab17f647b197162932b131c41bb18cf5c18917d
2016-12-29 09:29:52 -05:00
Julia Reynolds
b42ac40b5f Merge "Support showing notifications as badges." 2016-12-21 21:15:47 +00: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
Julia Reynolds
d6835a20fc Support showing notifications as badges.
And remove unneeded app level settings.

Change-Id: I88f506b0704195181d1748a3135f8ee0f39b774f
Test: manual for now. will add tests when have real mocks for the pages
2016-12-20 13:07:04 -05: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
TreeHugger Robot
fb8d1bf427 Merge "Remove no-op handlePerferenceTreeClick from PrefControllers" 2016-12-08 01:27:51 +00:00
Fan Zhang
9b6f181340 Remove no-op handlePerferenceTreeClick from PrefControllers
Bug: 33429853
Test: RunSettingsRoboTests
Change-Id: I5633953e3d7b07f9006e541b96a24a2a769e2686
2016-12-07 15:34:31 -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
TreeHugger Robot
64559d3049 Merge "Update SoundSettings to extend DashboardFragment." 2016-12-02 03:32:09 +00: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
Amith Yamasani
21556cdba1 Adapt to behavior change in MATCH_UNINSTALLED_PACKAGES
Don't use the PM flag to reach across users.
If retrieving labels, etc., use MATCH_ANY_USER, since
several Settings screens show work profile apps as well.

Bug: 31000380
Test: Manual test of affected screens
Change-Id: Ib6f981ae8443f640276d395c37247c8c0b610894
2016-11-30 13:24:54 -08:00
Julia Reynolds
7270be09d5 Method rename
Test: make
Change-Id: Iec3a811004183c2691dc6776c7f3b620e60e4872
2016-11-23 11:33:29 -05:00
Julia Reynolds
35476d12d1 Ringtone -> Sound
Test: make -j32
Change-Id: I53864e877e94ff1560f8e9637a87daf7b5118398
2016-11-16 09:45:23 -05:00
Sudheer Shanka
acb1a61f3f Update usage of ActivityManagerNative.
Bug: 30977067
Test: N/A
Change-Id: I46e37a09cff059d2784a819bc2651d6973fbd268
2016-11-14 12:59:11 -08:00
Fan Zhang
33b0d91d74 Add video to each gesture preference screen.
- Refactor GesturePreference to a generic VideoPreference.
- The old video_preference.xml is only for magnification video, so
  renamed.
- And use VideoPreference in gesture setting pages.
- Refactor common logic into GesturePreferenceController.

Bug: 32637613
Test: RunSettingsRoboTests

Change-Id: I58580b01a32873cb32c5dc5bf2ec021d5b1400cc
2016-11-10 15:24:45 -08:00
Tamas Berghammer
265d3c2a0c Update package names to work with the proto3 compiler
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
2016-11-08 14:06:17 +00:00
Julia Reynolds
ec767cc440 Channel updates from users lock fields from interference.
Also some apis have changed.

Test: manual, modify settings and check policy xml.

Change-Id: I967cb1fb30d8d400bdc0f3aa92fa07b4c87ddcf5
2016-10-31 15:16:28 -04:00
Fan Zhang
fdb833873a Use new app header in more screens.
- This covers app data usage settings, power usage details
- Addded helper method on AppHeaderController to build the header as
  Preference because every fragment needs to do this anyway.

Bug: 32442716
Test: RunSettingsRoboTests

Change-Id: I6d38321b867154f8fb5194b993d118bcdbbfedc9
2016-10-28 17:16:39 -07:00
Fan Zhang
1ff25ba7e6 Modify AppHeaderController to provide UI for notif settings
- The AppHeaderController is no longer a singleton. Each time appheader
  should be updated we will create a new controller. It acts as a
  builder/mutator, user provides customizable inputs, and the controller
  will bind everything to UI when calling done().

Bug: 32442716
Test: RunSettingsRoboTests
Change-Id: Icfc5bcd8bc170a02b57432d864eaddf71db0d5b4
2016-10-27 17:23:33 -07:00
Fan Zhang
242da31179 Fix logging spam in DashboardFragment.
When updating preferences managed through PreferenceController, the
fragment should skip prefs that are not available.

Bug: 32255863
Test: RunSettingsRoboTests
Change-Id: I2f9b6ddf8c78d40068dc18f07e60672dcba4474a
2016-10-25 17:14:47 -07:00
Fan Zhang
5b6478a349 Add swipe to see notification to "Notification preferences"
Bug: 31799948
Test: RunSettingsRoboTests
Change-Id: Ib892ca4d5596c1c89e1efaf636a3eefd7cee371a
2016-10-24 15:33:12 -07: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
Julia Reynolds
6e99b3ee4e Fix settings crash when disabling listener.
Bug: 32092445
Test: manual
Change-Id: Iaa26e755381ba202cccf6d518dacb86eae4c6d10
2016-10-11 17:22:44 -04:00
Dan Sandler
acf763e996 Suppress notif block/silence settings for essential packages.
Companion to change I6b8fa374.

Bug: 31360343
Test: Manual. With config_nonBlockableNotificationPackages
      set to include com.android.dialer, examine Dialer's
      notification settings. Be sure to test with advanced
      notification controls enabled in System UI Tuner.
Change-Id: Ifbe13acf4cb02d6642f5c80e000f5b558f289920
2016-10-05 14:18:40 +00:00
Fan Zhang
aa71afe597 Use MetricsFeatureProvider for logging in Settings.
Bug: 31664539
Test: make RunSettingsRoboTests for regression
Test: adb logcat -b events | egrep "(sysui_|notification_)" for
      verifying log

Change-Id: Id944be7c4ff9911aebee481c2df485542f1318f0
2016-09-23 08:37:37 -07:00
Fan Zhang
1e516287bd Add visibility metrics to dialogs.
Bug: 30681529
Test: adb logcat -b events | egrep "(sysui_|notification_)"
Change-Id: I199d2e1b2cb8588a562b46bb8128d8ece24952f0
2016-09-19 17:34:12 -07:00
Julia Reynolds
b5ec2d71a2 Add notification channel settings.
If a user has set a preference at an app wide level, it cannot be
undone at a channel level, but channels can be more restrictive.

Tests: changing settings for apps and channels.

Change-Id: I7907b8179ffc24d68197c917f182e63d8e1ff7a7
2016-09-15 21:46:17 -04:00
Julia Reynolds
5de900acf9 Non-blockable notification packages can't be blocked. am: 77b1f52574 am: d8a033cca5
am: 77f405ae50

Change-Id: I22a588c12e61774a46e79f34e0a6190116c27c8f
2016-09-15 18:34:24 +00:00
Julia Reynolds
77b1f52574 Non-blockable notification packages can't be blocked.
Bug: 31404047
Change-Id: Icbe7e5e57983d281f6fe21e9b4715c822784d43c
2016-09-12 11:13:10 -04:00
Robin Lee
788671647c Eliminate useless 'isManagedProfile' utils method
This exists in UserManager now

Change-Id: If35326a1fe0de3c7bfde842c5c170899dc5d819b
2016-09-12 16:25:28 +09:00
Salvador Martinez
923534f641 resolve merge conflicts of 8ec7028 to master
Change-Id: I02767dea7e2fd8e6dfdfe495af1c28587b080630
2016-09-07 10:24:03 -07:00
Salvador Martinez
b706d4e956 Fixed Sound Settings summary text
The summary for Sound settings was not
descriptive enough when the volume was set
to 0% so additional strings were added. Now
it will change let you know the status
of the ringer and vibration settings when
at 0% volume. Espresso tests added to test
that text is properly updated in each of
these states.

Test: make SettingsTests
Bug: 31099179
Change-Id: Id49e2d0c4b7ac0f17efcdaf31de48d5eb678ca46
2016-09-06 17:23:50 -07:00
TreeHugger Robot
1355d03287 Merge "[Settings App] Get ringtone titles from Ringtone" 2016-09-06 00:27:39 +00:00
Robin Lee
83e5babed1 Merge "Cut work sound prefs when personal ones are gone" 2016-09-05 09:58:17 +00:00
Robin Lee
e51fc163c2 Cut work sound prefs when personal ones are gone
For example when:
 - voice calls aren't supported, we hide phone ringtone.
 - audio is single stream, we hide everything.

Bug: 30658854
Change-Id: I8b2ad2fa08b35fa93f10447ef718a767fa389417
2016-09-02 17:28:00 +01:00
Geoffrey Pitsch
75dc84c85e Only show BootSounds preference if has_boot_sounds is true. am: fd351eaaf1 am: de67bc9d68
am: 93352a4451

Change-Id: I6fe28d8c40bd254458121f1bea3c23b567f36b18
2016-08-29 13:39:23 +00:00