commit 7dbbe131683c231f6820bca4d67853649a4836f8
author Sudheer Shanka <sudheersai@google.com> Tue Feb 16 14:19:32 2016 +0000
committer Sudheer Shanka <sudheersai@google.com> Fri Feb 19 20:18:43 2016 +0000
tree 48cf00a288aee89f263c71fb487321eea3963737
parent 5d8e963c83fd9198cb66e7fc745f9ff2a1919c44

Add disabled by policy empty views to more screens.

Bug: 27214401
Change-Id: I6cd4292a63610671070bf2134105e9e348c3ab32

src/com/android/settings/TetherSettings.java

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 3aa72d2..0338020 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -42,7 +42,6 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.wifi.WifiApDialog;
@@ -56,7 +55,7 @@
 /*
  * Displays preferences for Tethering.
  */
-public class TetherSettings extends SettingsPreferenceFragment
+public class TetherSettings extends RestrictedSettingsFragment
         implements DialogInterface.OnClickListener, Preference.OnPreferenceChangeListener {
 
     private static final String USB_TETHER_SETTINGS = "usb_tether_settings";
@@ -94,7 +93,6 @@
     private WifiApDialog mDialog;
     private WifiManager mWifiManager;
     private WifiConfiguration mWifiConfig = null;
-    private UserManager mUm;
     private ConnectivityManager mCm;
 
     private boolean mUsbConnected;
@@ -113,16 +111,18 @@
         return MetricsEvent.TETHER;
     }
 
+    public TetherSettings() {
+        super(UserManager.DISALLOW_CONFIG_TETHERING);
+    }
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         addPreferencesFromResource(R.xml.tether_prefs);
 
-        mUm = (UserManager) getSystemService(Context.USER_SERVICE);
-
-        if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)
-                || !mUm.isAdminUser()) {
+        setIfOnlyAvailableForAdmins(true);
+        if (isUiRestricted()) {
             mUnavailable = true;
             setPreferenceScreen(new PreferenceScreen(getPrefContext(), null));
             return;
@@ -259,11 +259,10 @@
         super.onStart();
 
         if (mUnavailable) {
-            TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
-            setEmptyView(emptyView);
-            if (emptyView != null) {
-                emptyView.setText(R.string.tethering_settings_not_available);
+            if (!isUiRestrictedByOnlyAdmin()) {
+                getEmptyTextView().setText(R.string.tethering_settings_not_available);
             }
+            getPreferenceScreen().removeAll();
             return;
         }