PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Limit unconfigurability to specified channels. am: 80fa6b5833

Browse Source 
am: 0320d4e69f

Change-Id: Icc6ba97501c229ae8d5bf5a7169feae2af85f3a2
This commit is contained in:
Alison Cichowlas
2017-06-13 01:49:37 +00:00
committed by android-build-merger
parent 303daecc2e 0320d4e69f
commit 79f12ed51e
5 changed files with 164 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/notification/NotificationSettingsBase.java
View File

@@ -293,8 +293,8 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen
private void setupImportanceToggle() {
mImportanceToggle = (RestrictedSwitchPreference) findPreference(KEY_ALLOW_SOUND);
mImportanceToggle.setDisabledByAdmin(mSuspendedAppsAdmin);
mImportanceToggle.setEnabled(!(mAppRow.lockedImportance
|| mImportanceToggle.isDisabledByAdmin()));
mImportanceToggle.setEnabled(isChannelConfigurable(mChannel)
&& !mImportanceToggle.isDisabledByAdmin());
mImportanceToggle.setChecked(mChannel.getImportance() >= IMPORTANCE_DEFAULT
|| mChannel.getImportance() == IMPORTANCE_UNSPECIFIED);
mImportanceToggle.setOnPreferenceChangeListener(
@@ -315,7 +315,7 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen
protected void setupPriorityPref(boolean priority) {
mPriority = (RestrictedSwitchPreference) findPreference(KEY_BYPASS_DND);
mPriority.setDisabledByAdmin(mSuspendedAppsAdmin);
mPriority.setEnabled(!(mAppRow.lockedImportance || mPriority.isDisabledByAdmin()));
mPriority.setEnabled(isChannelConfigurable(mChannel) && !mPriority.isDisabledByAdmin());
mPriority.setChecked(priority);
mPriority.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
@@ -447,10 +447,15 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen
return lockscreenSecure;
}
protected boolean isChannelConfigurable(NotificationChannel channel) {
return !channel.getId().equals(mAppRow.lockedChannelId);
}
protected boolean isChannelBlockable(boolean systemApp, NotificationChannel channel) {
if (!mAppRow.systemApp) {
return true;
}
return channel.isBlockableSystem()
|| channel.getImportance() == NotificationManager.IMPORTANCE_NONE;
}