commit 682a916836f5e108289a70579f671f9d4a880993
author Sudheer Shanka <sudheersai@google.com> Wed Jan 13 22:10:18 2016 +0000
committer Sudheer Shanka <sudheersai@google.com> Wed Jan 20 17:48:27 2016 +0000
tree db44c06c7beedd0d5ed9d943867a9ad1e6c47f1b
parent b484d74d73a4ff106b9ead885d5479252cec207d

Add padlocks to preferences that can be disabled by policy.

Change-Id: I43b6b5954ef6ec65b86d99321cabab9f49df842d

src/com/android/settings/WirelessSettings.java

diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index f5a9dec..63455d8 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -51,6 +51,7 @@
 import com.android.settings.nfc.NfcEnabler;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.RestrictedPreference;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -226,7 +227,8 @@
         final Activity activity = getActivity();
         mAirplaneModePreference = (SwitchPreference) findPreference(KEY_TOGGLE_AIRPLANE);
         SwitchPreference nfc = (SwitchPreference) findPreference(KEY_TOGGLE_NFC);
-        PreferenceScreen androidBeam = (PreferenceScreen) findPreference(KEY_ANDROID_BEAM_SETTINGS);
+        RestrictedPreference androidBeam = (RestrictedPreference) findPreference(
+                KEY_ANDROID_BEAM_SETTINGS);
 
         mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
         mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
@@ -258,7 +260,7 @@
         }
         // Disable VPN.
         // TODO: http://b/23693383
-        if (!isAdmin || mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {
+        if (!isAdmin) {
             removePreference(KEY_VPN_SETTINGS);
         }
 
@@ -315,10 +317,10 @@
         // Disable Tethering if it's not allowed or if it's a wifi-only device
         final ConnectivityManager cm =
                 (ConnectivityManager) activity.getSystemService(Context.CONNECTIVITY_SERVICE);
-        if (!isAdmin || !cm.isTetheringSupported()
-                || mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)) {
+
+        if (!isAdmin || !cm.isTetheringSupported()) {
             getPreferenceScreen().removePreference(findPreference(KEY_TETHER_SETTINGS));
-        } else {
+        } else if (!mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)) {
             Preference p = findPreference(KEY_TETHER_SETTINGS);
             p.setTitle(com.android.settingslib.Utils.getTetheringLabel(cm));
 
@@ -347,6 +349,19 @@
         } else {
             removePreference(KEY_WFC_SETTINGS);
         }
+
+        RestrictedPreference tetherSettingsPref = (RestrictedPreference) findPreference(
+                KEY_TETHER_SETTINGS);
+        if (tetherSettingsPref != null) {
+            tetherSettingsPref.checkRestrictionAndSetDisabled(
+                    UserManager.DISALLOW_CONFIG_TETHERING);
+        }
+
+        RestrictedPreference vpnSettingsPref = (RestrictedPreference) findPreference(
+                KEY_VPN_SETTINGS);
+        if (vpnSettingsPref != null) {
+            vpnSettingsPref.checkRestrictionAndSetDisabled(UserManager.DISALLOW_CONFIG_VPN);
+        }
     }
 
     @Override