Merge "Part3 - Don't add padlock if the restriction is not set by admin." into nyc-dev

2016-02-19 19:31:44 +00:00
parent 1b59691855 9e9e63b7b3
commit 5d8e963c83
21 changed files with 207 additions and 84 deletions
--- a/src/com/android/settings/notification/ZenModeSettingsBase.java
+++ b/src/com/android/settings/notification/ZenModeSettingsBase.java
@@ -69,8 +69,12 @@ abstract public class ZenModeSettingsBase extends RestrictedSettingsFragment {
        maybeRefreshRules(true, true /*fireChanged*/);
        mSettingsObserver.register();
        if (isUiRestricted()) {
-            getPreferenceScreen().removeAll();
-            return;
+            if (isUiRestrictedByOnlyAdmin()) {
+                getPreferenceScreen().removeAll();
+                return;
+            } else {
+                finish();
+            }
        }
    }