Depend on support lib preferences

Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e

src/com/android/settings/vpn2/AppDialog.java

@@ -20,12 +20,8 @@ import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.view.View;
-import android.widget.TextView;
 
-import com.android.internal.net.VpnConfig;
 import com.android.settings.R;
 
 /**

src/com/android/settings/vpn2/AppDialogFragment.java

@@ -22,7 +22,6 @@ import android.app.DialogFragment;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
 import android.net.IConnectivityManager;
 import android.os.Bundle;
 import android.os.RemoteException;

src/com/android/settings/vpn2/AppPreference.java

@@ -16,14 +16,12 @@
 
 package com.android.settings.vpn2;
 
-import android.app.AppGlobals;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
-import android.os.RemoteException;
 import android.os.UserHandle;
-import android.preference.Preference;
+import android.support.v7.preference.Preference;
 import android.view.View.OnClickListener;
 
 import com.android.internal.net.LegacyVpnInfo;
@@ -31,7 +29,7 @@ import com.android.internal.net.VpnConfig;
 import com.android.settings.R;
 
 /**
- * {@link android.preference.Preference} containing information about a VPN
+ * {@link android.support.v7.preference.Preference} containing information about a VPN
  * application. Tracks the package name and connection state.
  */
 public class AppPreference extends ManageablePreference {

src/com/android/settings/vpn2/ConfigPreference.java

@@ -17,16 +17,16 @@
 package com.android.settings.vpn2;
 
 import android.content.Context;
-import android.preference.Preference;
+import android.support.v7.preference.Preference;
 import android.view.View.OnClickListener;
 
-import static com.android.internal.net.LegacyVpnInfo.STATE_CONNECTED;
-
 import com.android.internal.net.VpnProfile;
 import com.android.settings.R;
 
+import static com.android.internal.net.LegacyVpnInfo.STATE_CONNECTED;
+
 /**
- * {@link android.preference.Preference} referencing a VPN
+ * {@link android.support.v7.preference.Preference} referencing a VPN
  * configuration. Tracks the underlying profile and its connection
  * state.
  */

src/com/android/settings/vpn2/LockdownConfigFragment.java

@@ -35,7 +35,6 @@ import android.widget.Toast;
 
 import com.android.internal.net.VpnProfile;
 import com.android.settings.R;
-import com.google.android.collect.Lists;
 
 import java.util.ArrayList;
 import java.util.List;

src/com/android/settings/vpn2/ManageablePreference.java

@@ -17,7 +17,8 @@
 package com.android.settings.vpn2;
 
 import android.content.Context;
-import android.preference.Preference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -41,10 +42,10 @@ public class ManageablePreference extends Preference {
     }
 
     @Override
-    protected void onBindView(View view) {
+    public void onBindViewHolder(PreferenceViewHolder view) {
         mManageView = view.findViewById(R.id.manage);
         mManageView.setOnClickListener(mListener);
         mManageView.setTag(this);
-        super.onBindView(view);
+        super.onBindViewHolder(view);
     }
 }

src/com/android/settings/vpn2/VpnSettings.java

@@ -35,11 +35,11 @@ import android.os.ServiceManager;
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.preference.Preference;
-import android.preference.PreferenceGroup;
-import android.preference.PreferenceScreen;
 import android.security.Credentials;
 import android.security.KeyStore;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
 import android.util.SparseArray;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -58,7 +58,6 @@ import com.google.android.collect.Lists;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 
 import static android.app.AppOpsManager.OP_ACTIVATE_VPN;
@@ -108,7 +107,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
         mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
         if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {
             mUnavailable = true;
-            setPreferenceScreen(new PreferenceScreen(getActivity(), null));
+            setPreferenceScreen(new PreferenceScreen(getPrefContext(), null));
             setHasOptionsMenu(false);
             return;
         }
@@ -163,7 +162,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
         if (mUnavailable) {
             // Show a message to explain that VPN settings have been disabled
             TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
-            getListView().setEmptyView(emptyView);
+            setEmptyView(emptyView);
             if (emptyView != null) {
                 emptyView.setText(R.string.vpn_settings_not_available);
             }
@@ -215,7 +214,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
 
         // Fetch configured VPN profiles from KeyStore
         for (VpnProfile profile : loadVpnProfiles(mKeyStore)) {
-            final ConfigPreference pref = new ConfigPreference(getActivity(), mManageListener,
+            final ConfigPreference pref = new ConfigPreference(getPrefContext(), mManageListener,
                     profile);
             pref.setOnPreferenceClickListener(this);
             mConfigPreferences.put(profile.key, pref);
@@ -225,7 +224,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
         // 3rd-party VPN apps can change elsewhere. Reload them every time.
         for (AppOpsManager.PackageOps pkg : getVpnApps()) {
             String key = getVpnIdentifier(UserHandle.getUserId(pkg.getUid()), pkg.getPackageName());
-            final AppPreference pref = new AppPreference(getActivity(), mManageListener,
+            final AppPreference pref = new AppPreference(getPrefContext(), mManageListener,
                     pkg.getPackageName(), pkg.getUid());
             pref.setOnPreferenceClickListener(this);
             mAppPreferences.put(key, pref);