Merge \"Prevent users from blocking system notifications.\" into nyc-dev

am: b2301cb4c2 Change-Id: I9d5f2f4957bdc86ab25e0436100f5b126cb97bb7
2016-06-14 22:30:19 +00:00
parent cf605973b2 b2301cb4c2
commit f04499b2e1
1 changed files with 29 additions and 25 deletions
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -175,6 +175,9 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen
            });
        } else {
            setVisible(mImportance, false);
+            if (isSystemApp) {
+                setVisible(mBlock, false);
+            } else {
                boolean blocked = importance == Ranking.IMPORTANCE_NONE || banned;
                mBlock.setChecked(blocked);
                mBlock.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@@ -203,6 +206,7 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen
                updateDependents(banned ? Ranking.IMPORTANCE_NONE : importance);
            }
        }
+    }

    protected void setupPriorityPref(boolean priority) {
        mPriority.setDisabledByAdmin(mSuspendedAppsAdmin);