commit 39b467482d1bf256a111c757e9b7621c6f523271
author Jason Monk <jmonk@google.com> Thu Sep 10 15:52:51 2015 -0400
committer Jason Monk <jmonk@google.com> Tue Oct 13 10:12:20 2015 -0400
tree 7fe0def001ba78bf27f89c81456e891787fb2a23
parent 136ed7b6b2cae5ae02859330296087c734e2b70f

Depend on support lib preferences

Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e

src/com/android/settings/TetherSettings.java

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index d5df40f..ee8900e 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -16,11 +16,6 @@
 
 package com.android.settings;
 
-import static com.android.settingslib.TetherUtil.TETHERING_INVALID;
-import static com.android.settingslib.TetherUtil.TETHERING_WIFI;
-import static com.android.settingslib.TetherUtil.TETHERING_USB;
-import static com.android.settingslib.TetherUtil.TETHERING_BLUETOOTH;
-
 import android.app.Activity;
 import android.app.Dialog;
 import android.bluetooth.BluetoothAdapter;
@@ -38,11 +33,10 @@
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.UserHandle;
 import android.os.UserManager;
-import android.preference.Preference;
-import android.preference.PreferenceScreen;
-import android.preference.SwitchPreference;
+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.MetricsLogger;
@@ -53,6 +47,11 @@
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static com.android.settingslib.TetherUtil.TETHERING_BLUETOOTH;
+import static com.android.settingslib.TetherUtil.TETHERING_INVALID;
+import static com.android.settingslib.TetherUtil.TETHERING_USB;
+import static com.android.settingslib.TetherUtil.TETHERING_WIFI;
+
 /*
  * Displays preferences for Tethering.
  */
@@ -127,7 +126,7 @@
         if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)
                 || !mUm.isAdminUser()) {
             mUnavailable = true;
-            setPreferenceScreen(new PreferenceScreen(getActivity(), null));
+            setPreferenceScreen(new PreferenceScreen(getPrefContext(), null));
             return;
         }
 
@@ -286,7 +285,7 @@
 
         if (mUnavailable) {
             TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
-            getListView().setEmptyView(emptyView);
+            setEmptyView(emptyView);
             if (emptyView != null) {
                 emptyView.setText(R.string.tethering_settings_not_available);
             }
@@ -561,7 +560,7 @@
     }
 
     @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
+    public boolean onPreferenceTreeClick(Preference preference) {
         ConnectivityManager cm =
                 (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
 
@@ -606,7 +605,7 @@
             showDialog(DIALOG_AP_SETTINGS);
         }
 
-        return super.onPreferenceTreeClick(screen, preference);
+        return super.onPreferenceTreeClick(preference);
     }
 
     private static String findIface(String[] ifaces, String[] regexes) {