Use SwitchDpcPreference for user restrictions.

Change-Id: I67ad4b8d5f73fde5143bb18334a1ffda3a88b6de

Author: AndrewScull

app/src/main/java/com/afwsamples/testdpc/common/Util.java

@@ -136,9 +136,4 @@ public static boolean isPrimaryUser(Context context) {
             return userManager.isSystemUser();
         }
     }
-
-    public static void disablePreference(Preference preference, int whyResId) {
-        preference.setEnabled(false);
-        preference.setSummary(whyResId);
-    }
 }

app/src/main/java/com/afwsamples/testdpc/common/preference/DpcPreferenceHelper.java

@@ -53,18 +53,20 @@ public class DpcPreferenceHelper {
     private int mAdminConstraint;
     private int mUserConstraint;
 
+    private static final int NUM_ADMIN_KINDS = 2;
     public static final int ADMIN_DEVICE_OWNER = 0x1;
     public static final int ADMIN_PROFILE_OWNER = 0x2;
     public static final int ADMIN_ANY = ADMIN_DEVICE_OWNER | ADMIN_PROFILE_OWNER;
 
+    private static final int NUM_USER_KINDS = 3;
     public static final int USER_PRIMARY_USER = 0x1;
     public static final int USER_SECONDARY_USER = 0x2;
     public static final int USER_MANAGED_PROFILE = 0x4;
     public static final int USER_ANY =
             USER_PRIMARY_USER | USER_SECONDARY_USER | USER_MANAGED_PROFILE;
-    public static final int NOT_USER_PRIMARY_USER = USER_ANY & ~USER_PRIMARY_USER;
-    public static final int NOT_USER_SECONDARY_USER = USER_ANY & ~USER_SECONDARY_USER;
-    public static final int NOT_USER_MANAGED_PROFILE = USER_ANY & ~USER_MANAGED_PROFILE;
+    public static final int USER_NOT_PRIMARY_USER = USER_ANY & ~USER_PRIMARY_USER;
+    public static final int USER_NOT_SECONDARY_USER = USER_ANY & ~USER_SECONDARY_USER;
+    public static final int USER_NOT_MANAGED_PROFILE = USER_ANY & ~USER_MANAGED_PROFILE;
 
     public DpcPreferenceHelper(Context context, Preference preference, AttributeSet attrs) {
         mContext = context;
@@ -252,7 +254,7 @@ private boolean isEnabledForUser(int user) {
     }
 
     private String getAdminConstraintSummary() {
-        final List<String> admins = new ArrayList<>(3);
+        final List<String> admins = new ArrayList<>(NUM_ADMIN_KINDS);
 
         if (isEnabledForAdmin(ADMIN_DEVICE_OWNER)) {
             admins.add(mContext.getString(R.string.device_owner));
@@ -265,7 +267,7 @@ private String getAdminConstraintSummary() {
     }
 
     private String getUserConstraintSummary() {
-        final List<String> users = new ArrayList<>(3);
+        final List<String> users = new ArrayList<>(NUM_USER_KINDS);
 
         if (isEnabledForUser(USER_PRIMARY_USER)) {
             users.add(mContext.getString(R.string.primary_user));

app/src/main/java/com/afwsamples/testdpc/policy/UserRestrictionsDisplayFragment.java

@@ -55,18 +55,20 @@
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.UserManager;
 import android.support.v14.preference.PreferenceFragment;
-import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.afwsamples.testdpc.DeviceAdminReceiver;
 import com.afwsamples.testdpc.R;
-import com.afwsamples.testdpc.common.Util;
+import com.afwsamples.testdpc.common.preference.DpcPreferenceBase;
+import com.afwsamples.testdpc.common.preference.DpcPreferenceHelper;
+import com.afwsamples.testdpc.common.preference.DpcSwitchPreference;
 
 public class UserRestrictionsDisplayFragment extends PreferenceFragment
         implements Preference.OnPreferenceChangeListener {
@@ -195,17 +197,17 @@ public void onCreatePreferences(Bundle bundle, String rootkey) {
                 getPreferenceManager().getContext());
         setPreferenceScreen(preferenceScreen);
 
+        final Context preferenceContext = getPreferenceManager().getContext();
         for (UserRestriction restriction : ALL_USER_RESTRICTIONS) {
-            SwitchPreference preference = new SwitchPreference(getPreferenceManager().getContext());
+            DpcSwitchPreference preference = new DpcSwitchPreference(preferenceContext);
             preference.setTitle(restriction.titleResId);
             preference.setKey(restriction.key);
             preference.setOnPreferenceChangeListener(this);
             preferenceScreen.addPreference(preference);
         }
 
         updateAllUserRestrictions();
-        disableIncompatibleRestrictionsByApiLevel();
-        disableIncompatibleRestrictionsByUserType();
+        constrainPerferences();
     }
 
     @Override
@@ -246,43 +248,31 @@ private void updateAllUserRestrictions() {
     }
 
     private void updateUserRestriction(String userRestriction) {
-        SwitchPreference preference = (SwitchPreference) findPreference(userRestriction);
+        DpcSwitchPreference preference = (DpcSwitchPreference) findPreference(userRestriction);
         boolean disallowed = mUserManager.hasUserRestriction(userRestriction);
         preference.setChecked(disallowed);
     }
 
-    private void disableIncompatibleRestrictionsByApiLevel() {
-        if (Util.isBeforeM()) {
-            for (String restriction : MNC_PLUS_RESTRICTIONS) {
-                Util.disablePreference(findPreference(restriction), R.string.requires_android_m);
-            }
+    private void constrainPerferences() {
+        for (String restriction : MNC_PLUS_RESTRICTIONS) {
+            DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);
+            pref.setMinSdkVersion(Build.VERSION_CODES.M);
         }
-        if (Util.isBeforeN()) {
-            for (String restriction : NYC_PLUS_RESTRICTIONS) {
-                Util.disablePreference(findPreference(restriction), R.string.requires_android_n);
-            }
+        for (String restriction : NYC_PLUS_RESTRICTIONS) {
+            DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);
+            pref.setMinSdkVersion(Build.VERSION_CODES.N);
         }
-    }
-
-    private void disableIncompatibleRestrictionsByUserType() {
-        String pkgName = getActivity().getPackageName();
-        boolean isProfileOwner = mDevicePolicyManager.isProfileOwnerApp(pkgName);
-        boolean isDeviceOwner = mDevicePolicyManager.isDeviceOwnerApp(pkgName);
-        if (isProfileOwner) {
-            for (String restriction : PRIMARY_USER_ONLY_RESTRICTIONS) {
-                Util.disablePreference(findPreference(restriction), R.string.primary_user_only);
-            }
-        } else if (isDeviceOwner) {
-            for (String restriction : MANAGED_PROFILE_ONLY_RESTRICTIONS) {
-                Util.disablePreference(findPreference(restriction), R.string.managed_profile_only);
-            }
+        for (String restriction : PRIMARY_USER_ONLY_RESTRICTIONS) {
+            DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);
+            pref.setUserConstraint(DpcPreferenceHelper.USER_PRIMARY_USER);
         }
-
-        if (Util.isManagedProfile(getActivity(), mAdminComponentName)) {
-            for (String restriction : NON_MANAGED_PROFILE_RESTRICTIONS) {
-                Util.disablePreference(findPreference(restriction),
-                        R.string.not_for_managed_profile);
-            }
+        for (String restriction : MANAGED_PROFILE_ONLY_RESTRICTIONS) {
+            DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);
+            pref.setUserConstraint(DpcPreferenceHelper.USER_MANAGED_PROFILE);
+        }
+        for (String restriction : NON_MANAGED_PROFILE_RESTRICTIONS) {
+            DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);
+            pref.setUserConstraint(DpcPreferenceHelper.USER_NOT_MANAGED_PROFILE);
         }
     }