Depend on support lib preferences

Bug: 24576551 Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
2015-09-10 15:52:51 -04:00
parent 136ed7b6b2
commit 39b467482d
308 changed files with 2684 additions and 1762 deletions
--- a/src/com/android/settings/wifi/AccessPointPreference.java
+++ b/src/com/android/settings/wifi/AccessPointPreference.java
@@ -15,6 +15,7 @@
 */
 package com.android.settings.wifi;

+import android.app.Fragment;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
@@ -22,7 +23,8 @@ import android.graphics.drawable.StateListDrawable;
 import android.net.wifi.WifiConfiguration;
 import android.os.Looper;
 import android.os.UserHandle;
-import android.preference.Preference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.SparseArray;
@@ -45,6 +47,8 @@ public class AccessPointPreference extends Preference {
    private final int mBadgePadding;
    private final UserBadgeCache mBadgeCache;

+    private final Fragment mFragment;
+
    private TextView mTitleView;
    private boolean mForSavedNetworks = false;
    private AccessPoint mAccessPoint;
@@ -65,11 +69,13 @@ public class AccessPointPreference extends Preference {
        mWifiSld = null;
        mBadgePadding = 0;
        mBadgeCache = null;
+        mFragment = null;
    }

    public AccessPointPreference(AccessPoint accessPoint, Context context, UserBadgeCache cache,
-                                 boolean forSavedNetworks) {
+            boolean forSavedNetworks, Fragment fragment) {
        super(context);
+        mFragment = fragment;
        mBadgeCache = cache;
        mAccessPoint = accessPoint;
        mForSavedNetworks = forSavedNetworks;
@@ -90,8 +96,19 @@ public class AccessPointPreference extends Preference {
    }

    @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
+    public void onBindViewHolder(final PreferenceViewHolder view) {
+        super.onBindViewHolder(view);
+        if (mFragment != null) {
+            view.itemView.setOnCreateContextMenuListener(mFragment);
+            view.itemView.setTag(this);
+            view.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    view.itemView.showContextMenu();
+                    return true;
+                }
+            });
+        }
        if (mAccessPoint == null) {
            // Used for dummy pref.
            return;
@@ -107,7 +124,7 @@ public class AccessPointPreference extends Preference {
            mTitleView.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, mBadge, null);
            mTitleView.setCompoundDrawablePadding(mBadgePadding);
        }
-        view.setContentDescription(mContentDescription);
+        view.itemView.setContentDescription(mContentDescription);
    }

    protected void updateIcon(int level, Context context) {
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -29,16 +29,14 @@ import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WpsInfo;
 import android.os.Bundle;
-import android.os.UserHandle;
 import android.os.UserManager;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceScreen;
-import android.preference.SwitchPreference;
 import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.security.Credentials;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@@ -239,7 +237,7 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
    }

    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
+    public boolean onPreferenceTreeClick(Preference preference) {
        String key = preference.getKey();

        if (KEY_NOTIFY_OPEN_NETWORKS.equals(key)) {
@@ -247,7 +245,7 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
                    Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
                    ((SwitchPreference) preference).isChecked() ? 1 : 0);
        } else {
-            return super.onPreferenceTreeClick(screen, preference);
+            return super.onPreferenceTreeClick(preference);
        }
        return true;
    }
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -21,8 +21,8 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceScreen;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;

 import com.android.internal.logging.MetricsLogger;
@@ -91,7 +91,7 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment

    private void initPreferences() {
        PreferenceScreen preferenceScreen = getPreferenceScreen();
-        final Context context = getActivity();
+        final Context context = getPrefContext();

        final List<AccessPoint> accessPoints = WifiTracker.getCurrentAccessPoints(context, true,
                false, true);
@@ -109,7 +109,7 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
        final int accessPointsSize = accessPoints.size();
        for (int i = 0; i < accessPointsSize; ++i){
            AccessPointPreference preference = new AccessPointPreference(accessPoints.get(i),
-                    context, mUserBadgeCache, true);
+                    context, mUserBadgeCache, true, this);
            preference.setIcon(null);
            preferenceScreen.addPreference(preference);
        }
@@ -183,12 +183,12 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
    }

    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
+    public boolean onPreferenceTreeClick(Preference preference) {
        if (preference instanceof AccessPointPreference) {
            showDialog((AccessPointPreference) preference, false);
            return true;
        } else{
-            return super.onPreferenceTreeClick(screen, preference);
+            return super.onPreferenceTreeClick(preference);
        }
    }

--- a/src/com/android/settings/wifi/WifiAPITest.java
+++ b/src/com/android/settings/wifi/WifiAPITest.java
@@ -16,19 +16,18 @@

 package com.android.settings.wifi;

-import com.android.settings.R;
-
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.net.wifi.WifiManager;
-
 import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceScreen;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
 import android.text.Editable;
 import android.widget.EditText;

+import com.android.settings.PreferenceActivity;
+import com.android.settings.R;
+

 /**
 * Provide an interface for testing out the Wifi API
@@ -88,8 +87,8 @@ Preference.OnPreferenceClickListener {
    //============================

    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        super.onPreferenceTreeClick(preferenceScreen, preference);
+    public boolean onPreferenceTreeClick(Preference preference) {
+        super.onPreferenceTreeClick(preference);
        return false;
    }

--- a/src/com/android/settings/wifi/WifiApDialog.java
+++ b/src/com/android/settings/wifi/WifiApDialog.java
@@ -27,6 +27,7 @@ import android.os.Bundle;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -34,11 +35,10 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
-import java.nio.charset.Charset;

 import com.android.settings.R;

-import android.util.Log;
+import java.nio.charset.Charset;

 /**
 * Dialog to configure the SSID and security settings
--- a/src/com/android/settings/wifi/WifiApEnabler.java
+++ b/src/com/android/settings/wifi/WifiApEnabler.java
@@ -23,8 +23,8 @@ import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
-import android.preference.SwitchPreference;
 import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;

 import com.android.settings.R;
 import com.android.settingslib.TetherUtil;
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -39,8 +39,8 @@ import android.security.Credentials;
 import android.security.KeyStore;
 import android.text.Editable;
 import android.text.InputType;
-import android.text.TextWatcher;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -58,11 +58,11 @@ import android.widget.TextView;

 import com.android.settings.ProxySelector;
 import com.android.settings.R;
-import com.android.settingslib.wifi.AccessPoint;
 import com.android.settings.Utils;
+import com.android.settingslib.wifi.AccessPoint;

-import java.net.InetAddress;
 import java.net.Inet4Address;
+import java.net.InetAddress;
 import java.util.Iterator;

 /**
--- a/src/com/android/settings/wifi/WifiConfigInfo.java
+++ b/src/com/android/settings/wifi/WifiConfigInfo.java
@@ -17,14 +17,15 @@
 package com.android.settings.wifi;

 import android.app.Activity;
+import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.widget.TextView;
-import android.net.wifi.WifiConfiguration;
-import java.util.List;

 import com.android.settings.R;

+import java.util.List;
+

 /**
 * Configuration details saved by the user on the WifiSettings screen
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -16,17 +16,16 @@

 package com.android.settings.wifi;

-import com.android.settings.R;
-import com.android.settingslib.wifi.AccessPoint;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.View;
-import android.view.WindowManager;
 import android.widget.Button;

+import com.android.settings.R;
+import com.android.settingslib.wifi.AccessPoint;
+
 class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterface.OnClickListener {

    public interface WifiDialogListener {
--- a/src/com/android/settings/wifi/WifiInfo.java
+++ b/src/com/android/settings/wifi/WifiInfo.java
@@ -16,10 +16,10 @@

 package com.android.settings.wifi;

-import com.android.settings.R;
-
 import android.os.Bundle;
-import android.preference.PreferenceActivity;
+
+import com.android.settings.PreferenceActivity;
+import com.android.settings.R;


 /**
--- a/src/com/android/settings/wifi/WifiNoInternetDialog.java
+++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java
@@ -22,15 +22,14 @@ import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.ConnectivityManager.NetworkCallback;
 import android.net.Network;
-import android.net.NetworkInfo;
 import android.net.NetworkCapabilities;
+import android.net.NetworkInfo;
 import android.net.NetworkRequest;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CheckBox;
-import android.widget.TextView;

 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
--- a/src/com/android/settings/wifi/WifiPickerActivity.java
+++ b/src/com/android/settings/wifi/WifiPickerActivity.java
@@ -15,15 +15,13 @@
 */
 package com.android.settings.wifi;

+import android.content.Intent;
+import android.support.v14.preference.PreferenceFragment;
+
 import com.android.settings.ButtonBarHandler;
+import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.wifi.p2p.WifiP2pSettings;
-import com.android.settings.R;
-
-import android.content.Intent;
-import android.preference.PreferenceFragment;
-
-import java.lang.Class;

 public class WifiPickerActivity extends SettingsActivity implements ButtonBarHandler {

--- a/src/com/android/settings/wifi/WifiScanModeActivity.java
+++ b/src/com/android/settings/wifi/WifiScanModeActivity.java
@@ -16,8 +16,6 @@

 package com.android.settings.wifi;

-import com.android.settings.R;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -30,6 +28,8 @@ import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.provider.Settings;

+import com.android.settings.R;
+
 /**
 * This activity requests users permission to allow scanning even when Wi-Fi is turned off
 */
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -16,8 +16,6 @@

 package com.android.settings.wifi;

-import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AppGlobals;
@@ -44,9 +42,8 @@ import android.os.HandlerThread;
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.UserHandle;
-import android.preference.Preference;
-import android.preference.PreferenceScreen;
 import android.provider.Settings;
+import android.support.v7.preference.Preference;
 import android.text.Spannable;
 import android.text.style.TextAppearanceSpan;
 import android.util.Log;
@@ -57,7 +54,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.TextView.BufferType;
@@ -81,6 +77,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

+import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
+
 /**
 * Two types of UI are provided here.
 *
@@ -450,9 +448,7 @@ public class WifiSettings extends RestrictedSettingsFragment

    @Override
    public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
-        if (info instanceof AdapterContextMenuInfo) {
-            Preference preference = (Preference) getListView().getItemAtPosition(
-                    ((AdapterContextMenuInfo) info).position);
+            Preference preference = (Preference) view.getTag();

            if (preference instanceof AccessPointPreference) {
                mSelectedAccessPoint = ((AccessPointPreference) preference).getAccessPoint();
@@ -483,7 +479,6 @@ public class WifiSettings extends RestrictedSettingsFragment
                    }
                }
            }
-        }
    }

    @Override
@@ -521,7 +516,7 @@ public class WifiSettings extends RestrictedSettingsFragment
    }

    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
+    public boolean onPreferenceTreeClick(Preference preference) {
        if (preference instanceof AccessPointPreference) {
            mSelectedAccessPoint = ((AccessPointPreference) preference).getAccessPoint();
            /** Bypass dialog for unsecured, unsaved, and inactive networks */
@@ -539,7 +534,7 @@ public class WifiSettings extends RestrictedSettingsFragment
                showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT);
            }
        } else {
-            return super.onPreferenceTreeClick(screen, preference);
+            return super.onPreferenceTreeClick(preference);
        }
        return true;
    }
@@ -661,13 +656,13 @@ public class WifiSettings extends RestrictedSettingsFragment
                            continue;
                        }
                        AccessPointPreference preference = new AccessPointPreference(accessPoint,
-                                getActivity(), mUserBadgeCache, false);
+                                getPrefContext(), mUserBadgeCache, false, this);
                        preference.setOrder(index++);

                        if (mOpenSsid != null && mOpenSsid.equals(accessPoint.getSsidStr())
                                && !accessPoint.isSaved()
                                && accessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
-                            onPreferenceTreeClick(getPreferenceScreen(), preference);
+                            onPreferenceTreeClick(preference);
                            mOpenSsid = null;
                        }
                        getPreferenceScreen().addPreference(preference);
@@ -707,7 +702,7 @@ public class WifiSettings extends RestrictedSettingsFragment
    protected TextView initEmptyView() {
        TextView emptyView = (TextView) getActivity().findViewById(android.R.id.empty);
        emptyView.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
-        getListView().setEmptyView(emptyView);
+        setEmptyView(emptyView);
        return emptyView;
    }

--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
@@ -19,7 +19,7 @@ package com.android.settings.wifi;
 import android.app.Dialog;
 import android.net.wifi.WifiConfiguration;
 import android.os.Bundle;
-import android.preference.PreferenceScreen;
+import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -27,6 +27,7 @@ import android.view.MenuInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;

@@ -150,16 +151,15 @@ public class WifiSettingsForSetupWizard extends WifiSettings {
    }

    protected void updateFooter(boolean isEmpty) {
-        if (isEmpty != mListLastEmpty && hasListView()) {
-            final ListView list = getListView();
-            list.removeFooterView(mEmptyFooter);
-            list.removeFooterView(mAddOtherNetworkItem);
-            list.removeFooterView(mMacAddressFooter);
+        if (isEmpty != mListLastEmpty) {
            if (isEmpty) {
-                list.addFooterView(mEmptyFooter, null, false);
+                setFooterView(mEmptyFooter);
            } else {
-                list.addFooterView(mAddOtherNetworkItem, null, true);
-                list.addFooterView(mMacAddressFooter, null, false);
+                LinearLayout layout = new LinearLayout(getContext());
+                layout.setOrientation(LinearLayout.VERTICAL);
+                layout.addView(mAddOtherNetworkItem);
+                layout.addView(mMacAddressFooter);
+                setFooterView(layout);
            }
            mListLastEmpty = isEmpty;
        }
--- a/src/com/android/settings/wifi/WifiSetupActivity.java
+++ b/src/com/android/settings/wifi/WifiSetupActivity.java
@@ -29,7 +29,7 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.preference.PreferenceFragment;
+import android.support.v14.preference.PreferenceFragment;
 import android.util.Log;

 import com.android.settings.ButtonBarHandler;
--- a/src/com/android/settings/wifi/WifiStatusTest.java
+++ b/src/com/android/settings/wifi/WifiStatusTest.java
@@ -16,20 +16,13 @@

 package com.android.settings.wifi;

-import com.android.settings.R;
-import com.android.settingslib.wifi.AccessPoint;
-
-import android.net.wifi.ScanResult;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.List;
-
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.NetworkInfo;
+import android.net.wifi.ScanResult;
 import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
@@ -43,8 +36,14 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;

+import com.android.settings.R;
+import com.android.settingslib.wifi.AccessPoint;
+
 import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.net.UnknownHostException;
+import java.util.List;


 /**
--- a/src/com/android/settings/wifi/WpsDialog.java
+++ b/src/com/android/settings/wifi/WpsDialog.java
@@ -32,11 +32,11 @@ import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;

+import com.android.settings.R;
+
 import java.util.Timer;
 import java.util.TimerTask;

-import com.android.settings.R;
-

 /**
 * Dialog to show WPS progress.
--- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
@@ -16,16 +16,16 @@

 package com.android.settings.wifi.p2p;

-import com.android.settings.R;
-
 import android.content.Context;
 import android.net.wifi.WifiManager;
 import android.net.wifi.p2p.WifiP2pDevice;
-import android.preference.Preference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
 import android.text.TextUtils;
-import android.view.View;
 import android.widget.ImageView;

+import com.android.settings.R;
+
 public class WifiP2pPeer extends Preference {

    private static final int[] STATE_SECURED = {R.attr.state_encrypted};
@@ -44,7 +44,7 @@ public class WifiP2pPeer extends Preference {
    }

    @Override
-    protected void onBindView(View view) {
+    public void onBindViewHolder(PreferenceViewHolder view) {
        if (TextUtils.isEmpty(device.deviceName)) {
            setTitle(device.deviceAddress);
        } else {
@@ -58,7 +58,7 @@ public class WifiP2pPeer extends Preference {
            mSignal.setImageState(STATE_SECURED,  true);
        }
        refresh();
-        super.onBindView(view);
+        super.onBindViewHolder(view);
    }

    @Override
--- a/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java
@@ -18,8 +18,8 @@ package com.android.settings.wifi.p2p;

 import android.content.Context;
 import android.net.wifi.p2p.WifiP2pGroup;
-import android.preference.Preference;
-import android.view.View;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;

 public class WifiP2pPersistentGroup extends Preference {

@@ -31,9 +31,9 @@ public class WifiP2pPersistentGroup extends Preference {
    }

    @Override
-    protected void onBindView(View view) {
+    public void onBindViewHolder(PreferenceViewHolder view) {
        setTitle(mGroup.getNetworkName());
-        super.onBindView(view);
+        super.onBindViewHolder(view);
    }

    int getNetworkId() {
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -26,22 +26,22 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.NetworkInfo;
+import android.net.wifi.WpsInfo;
 import android.net.wifi.p2p.WifiP2pConfig;
-import android.net.wifi.p2p.WifiP2pInfo;
 import android.net.wifi.p2p.WifiP2pDevice;
 import android.net.wifi.p2p.WifiP2pDeviceList;
 import android.net.wifi.p2p.WifiP2pGroup;
 import android.net.wifi.p2p.WifiP2pGroupList;
+import android.net.wifi.p2p.WifiP2pInfo;
 import android.net.wifi.p2p.WifiP2pManager;
 import android.net.wifi.p2p.WifiP2pManager.PeerListListener;
 import android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener;
-import android.net.wifi.WpsInfo;
 import android.os.Bundle;
 import android.os.SystemProperties;
-import android.preference.Preference;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceGroup;
-import android.preference.PreferenceScreen;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
 import android.text.InputFilter;
 import android.text.TextUtils;
 import android.util.Log;
@@ -301,16 +301,16 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
        preferenceScreen.removeAll();
        preferenceScreen.setOrderingAsAdded(true);

-        mThisDevicePref = new Preference(getActivity());
+        mThisDevicePref = new Preference(getPrefContext());
        mThisDevicePref.setPersistent(false);
        mThisDevicePref.setSelectable(false);
        preferenceScreen.addPreference(mThisDevicePref);

-        mPeersGroup = new PreferenceCategory(getActivity());
+        mPeersGroup = new PreferenceCategory(getPrefContext());
        mPeersGroup.setTitle(R.string.wifi_p2p_peer_devices);
        preferenceScreen.addPreference(mPeersGroup);

-        mPersistentGroup = new PreferenceCategory(getActivity());
+        mPersistentGroup = new PreferenceCategory(getPrefContext());
        mPersistentGroup.setTitle(R.string.wifi_p2p_remembered_groups);
        preferenceScreen.addPreference(mPersistentGroup);

@@ -381,7 +381,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
    }

    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
+    public boolean onPreferenceTreeClick(Preference preference) {
        if (preference instanceof WifiP2pPeer) {
            mSelectedWifiPeer = (WifiP2pPeer) preference;
            if (mSelectedWifiPeer.device.status == WifiP2pDevice.CONNECTED) {
@@ -423,7 +423,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
            mSelectedGroup = (WifiP2pPersistentGroup) preference;
            showDialog(DIALOG_DELETE_GROUP);
        }
-        return super.onPreferenceTreeClick(screen, preference);
+        return super.onPreferenceTreeClick(preference);
    }

    @Override