Depend on support lib preferences

Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e

src/com/android/settings/applications/AdvancedAppSettings.java

@@ -15,20 +15,16 @@
  */
 package com.android.settings.applications;
 
-import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.os.Bundle;
 import android.os.AsyncTask;
-import android.preference.Preference;
-import android.provider.Settings;
+import android.os.Bundle;
+import android.support.v7.preference.Preference;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback;
-import com.android.settings.fuelgauge.PowerWhitelistBackend;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.Session;

src/com/android/settings/applications/AppDomainsPreference.java

@@ -21,8 +21,8 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.settings.accessibility.ListDialogPreference;
 import com.android.settings.R;
+import com.android.settings.accessibility.ListDialogPreference;
 
 public class AppDomainsPreference extends ListDialogPreference {
     private int mNumEntries;

src/com/android/settings/applications/AppLaunchSettings.java

@@ -26,8 +26,8 @@ import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.util.ArraySet;
 import android.util.Log;
 import android.view.View;
@@ -41,7 +41,6 @@ import com.android.settings.Utils;
 import java.util.List;
 
 import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS;
-import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK;
 import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK;
 import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER;
 import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED;

src/com/android/settings/applications/AppOpsCategory.java

@@ -36,12 +36,12 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import java.util.List;
-
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.applications.AppOpsState.AppOpEntry;
 
+import java.util.List;
+
 public class AppOpsCategory extends ListFragment implements
         LoaderManager.LoaderCallbacks<List<AppOpEntry>> {
 

src/com/android/settings/applications/AppOpsDetails.java

@@ -18,7 +18,6 @@ package com.android.settings.applications;
 
 import android.app.Activity;
 import android.app.AppOpsManager;
-import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;

src/com/android/settings/applications/AppOpsState.java

@@ -27,9 +27,9 @@ import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.format.DateUtils;
-
 import android.util.Log;
 import android.util.SparseArray;
+
 import com.android.settings.R;
 
 import java.io.File;

src/com/android/settings/applications/AppStateAppOpsBridge.java

@@ -15,7 +15,6 @@
  */
 package com.android.settings.applications;
 
-import android.Manifest;
 import android.app.AppGlobals;
 import android.app.AppOpsManager;
 import android.app.AppOpsManager.PackageOps;
@@ -32,7 +31,6 @@ import android.util.SparseArray;
 
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import com.android.settingslib.applications.ApplicationsState.AppFilter;
 
 import java.util.Arrays;
 import java.util.Collection;

src/com/android/settings/applications/AppStateOverlayBridge.java

@@ -18,7 +18,6 @@ package com.android.settings.applications;
 import android.Manifest;
 import android.app.AppOpsManager;
 import android.content.Context;
-import android.util.Log;
 
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;

src/com/android/settings/applications/AppStateUsageBridge.java

@@ -18,7 +18,6 @@ package com.android.settings.applications;
 import android.Manifest;
 import android.app.AppOpsManager;
 import android.content.Context;
-import android.util.Log;
 
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;

src/com/android/settings/applications/AppStateWriteSettingsBridge.java

@@ -18,7 +18,6 @@ package com.android.settings.applications;
 import android.Manifest;
 import android.app.AppOpsManager;
 import android.content.Context;
-import android.util.Log;
 
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;

src/com/android/settings/applications/AppStorageSettings.java

@@ -32,8 +32,8 @@ import android.os.Message;
 import android.os.RemoteException;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
-import android.preference.Preference;
-import android.preference.PreferenceCategory;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
 import android.text.format.Formatter;
 import android.util.Log;
 import android.view.View;

src/com/android/settings/applications/AppViewHolder.java

@@ -20,7 +20,6 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 

src/com/android/settings/applications/ClearDefaultsPreference.java

@@ -24,14 +24,14 @@ import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
-import android.preference.Preference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.BulletSpan;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
@@ -43,7 +43,6 @@ public class ClearDefaultsPreference extends Preference {
 
     protected static final String TAG = ClearDefaultsPreference.class.getSimpleName();
 
-    private View mRootView;
     private Button mActivitiesButton;
 
     private AppWidgetManager mAppWidgetManager;
@@ -85,10 +84,10 @@ public class ClearDefaultsPreference extends Preference {
     }
 
     @Override
-    protected View onCreateView(ViewGroup parent) {
-        mRootView = super.onCreateView(parent);
+    public void onBindViewHolder(final PreferenceViewHolder view) {
+        super.onBindViewHolder(view);
 
-        mActivitiesButton = (Button) mRootView.findViewById(R.id.clear_activities_button);
+        mActivitiesButton = (Button) view.findViewById(R.id.clear_activities_button);
         mActivitiesButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -104,27 +103,20 @@ public class ClearDefaultsPreference extends Preference {
                         Log.e(TAG, "mUsbManager.clearDefaults", e);
                     }
                     mAppWidgetManager.setBindAppWidgetPermission(mPackageName, false);
-                    TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
+                    TextView autoLaunchView = (TextView) view.findViewById(R.id.auto_launch);
                     resetLaunchDefaultsUi(autoLaunchView);
                 }
             }
         });
 
-        return mRootView;
+        updateUI(view);
     }
 
-    @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
-
-        updateUI();
-    }
-
-    public boolean updateUI() {
+    public boolean updateUI(PreferenceViewHolder view) {
         boolean hasBindAppWidgetPermission =
                 mAppWidgetManager.hasBindAppWidgetPermission(mAppEntry.info.packageName);
 
-        TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
+        TextView autoLaunchView = (TextView) view.findViewById(R.id.auto_launch);
         boolean autoLaunchEnabled = Utils.hasPreferredActivities(mPm, mPackageName)
                 || isDefaultBrowser(mPackageName)
                 || Utils.hasUsbDefaults(mUsbManager, mPackageName);

src/com/android/settings/applications/DrawOverlayDetails.java

@@ -18,31 +18,25 @@ package com.android.settings.applications;
 import android.app.AlertDialog;
 import android.app.AppOpsManager;
 import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.SwitchPreference;
 import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.util.Log;
 
 import com.android.internal.logging.MetricsLogger;
-import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
 import com.android.settings.applications.AppStateOverlayBridge.OverlayState;
-import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
-import java.util.List;
-
 public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenceChangeListener,
         OnPreferenceClickListener {
 

src/com/android/settings/applications/InstalledAppDetails.java

@@ -21,6 +21,7 @@ import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.LoaderManager.LoaderCallbacks;
 import android.app.admin.DevicePolicyManager;
+import android.icu.text.ListFormatter;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -35,7 +36,6 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
-import android.icu.text.ListFormatter;
 import android.graphics.drawable.Drawable;
 import android.net.INetworkStatsService;
 import android.net.INetworkStatsSession;
@@ -48,8 +48,8 @@ import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
@@ -79,8 +79,8 @@ import com.android.settings.notification.AppNotificationSettings;
 import com.android.settings.notification.NotificationBackend;
 import com.android.settings.notification.NotificationBackend.AppRow;
 import com.android.settingslib.AppItem;
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.net.ChartData;
 import com.android.settingslib.net.ChartDataLoader;
 

src/com/android/settings/applications/InstalledAppDetailsTop.java

@@ -17,6 +17,7 @@
 package com.android.settings.applications;
 
 import android.content.Intent;
+
 import com.android.settings.SettingsActivity;
 
 public class InstalledAppDetailsTop extends SettingsActivity {

src/com/android/settings/applications/LayoutPreference.java

@@ -18,11 +18,13 @@ package com.android.settings.applications;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.preference.Preference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -33,7 +35,6 @@ public class LayoutPreference extends Preference {
 
     public LayoutPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        setSelectable(false);
         final TypedArray a = context.obtainStyledAttributes(
                 attrs, com.android.internal.R.styleable.Preference, 0, 0);
         int layoutResource = a.getResourceId(com.android.internal.R.styleable.Preference_layout,
@@ -44,7 +45,21 @@ public class LayoutPreference extends Preference {
         // Need to create view now so that findViewById can be called immediately.
         final View view = LayoutInflater.from(getContext())
                 .inflate(layoutResource, null, false);
+        setView(view);
+    }
 
+    public LayoutPreference(Context context, int resource) {
+        this(context, LayoutInflater.from(context).inflate(resource, null, false));
+    }
+
+    public LayoutPreference(Context context, View view) {
+        super(context);
+        setView(view);
+    }
+
+    private void setView(View view) {
+        setLayoutResource(R.layout.layout_preference_frame);
+        setSelectable(false);
         final ViewGroup allDetails = (ViewGroup) view.findViewById(R.id.all_details);
         if (allDetails != null) {
             Utils.forceCustomPadding(allDetails, true /* additive padding */);
@@ -54,13 +69,10 @@ public class LayoutPreference extends Preference {
     }
 
     @Override
-    protected View onCreateView(ViewGroup parent) {
-        return mRootView;
-    }
-
-    @Override
-    protected void onBindView(View view) {
-        // Do nothing.
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        FrameLayout layout = (FrameLayout) view.itemView;
+        layout.removeAllViews();
+        layout.addView(mRootView);
     }
 
     public View findViewById(int id) {

src/com/android/settings/applications/LinearColorPreference.java

@@ -17,8 +17,9 @@
 package com.android.settings.applications;
 
 import android.content.Context;
-import android.preference.Preference;
-import android.view.View;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
+
 import com.android.settings.R;
 
 public class LinearColorPreference extends Preference {
@@ -61,8 +62,8 @@ public class LinearColorPreference extends Preference {
     }
 
     @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        super.onBindViewHolder(view);
 
         LinearColorBar colors = (LinearColorBar)view.findViewById(
                 R.id.linear_color_bar);

src/com/android/settings/applications/ManageApplications.java

@@ -26,7 +26,6 @@ import android.os.Environment;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.PreferenceFrameLayout;
-import android.provider.Settings;
 import android.util.ArraySet;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -35,7 +34,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.AnimationUtils;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -57,9 +55,9 @@ import com.android.settings.Settings.AllApplicationsActivity;
 import com.android.settings.Settings.DomainsURLsAppListActivity;
 import com.android.settings.Settings.HighPowerApplicationsActivity;
 import com.android.settings.Settings.NotificationAppListActivity;
+import com.android.settings.Settings.OverlaySettingsActivity;
 import com.android.settings.Settings.StorageUseActivity;
 import com.android.settings.Settings.UsageAccessSettingsActivity;
-import com.android.settings.Settings.OverlaySettingsActivity;
 import com.android.settings.Settings.WriteSettingsActivity;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;

src/com/android/settings/applications/ManageAssist.java

@@ -21,12 +21,11 @@ import android.content.ComponentName;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
-import android.preference.Preference;
-import android.preference.SwitchPreference;
 import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
 
 import com.android.internal.logging.MetricsLogger;
-import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.voice.VoiceInputListPreference;

src/com/android/settings/applications/ManageDefaultApps.java

@@ -25,14 +25,13 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.preference.Preference;
 import android.provider.SearchIndexableResource;
+import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.internal.content.PackageMonitor;
 import com.android.internal.logging.MetricsLogger;
-import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.BaseSearchIndexProvider;

src/com/android/settings/applications/ProcStatsEntry.java

@@ -23,6 +23,7 @@ import android.os.Parcelable;
 import android.util.ArrayMap;
 import android.util.Log;
 import android.util.SparseArray;
+
 import com.android.internal.app.ProcessStats;
 
 import java.util.ArrayList;

src/com/android/settings/applications/ProcessStatsDetail.java

@@ -31,8 +31,8 @@ import android.content.pm.ServiceInfo;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.os.Process;
-import android.preference.Preference;
-import android.preference.PreferenceCategory;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
 import android.text.format.Formatter;
 import android.util.ArrayMap;
 import android.util.Log;
@@ -48,7 +48,6 @@ import com.android.settings.CancellablePreference;
 import com.android.settings.CancellablePreference.OnCancelListener;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
 import com.android.settings.applications.ProcStatsEntry.Service;
 
 import java.util.ArrayList;
@@ -245,7 +244,7 @@ public class ProcessStatsDetail extends SettingsPreferenceFragment {
         Collections.sort(entries, sEntryCompare);
         for (int ie = 0; ie < entries.size(); ie++) {
             ProcStatsEntry entry = entries.get(ie);
-            Preference processPref = new Preference(getActivity());
+            Preference processPref = new Preference(getPrefContext());
             processPref.setTitle(entry.mLabel);
             processPref.setSelectable(false);
 
@@ -350,7 +349,7 @@ public class ProcessStatsDetail extends SettingsPreferenceFragment {
             for (int is=0; is<services.size(); is++) {
                 final ProcStatsEntry.Service service = services.get(is);
                 CharSequence label = getLabel(service);
-                CancellablePreference servicePref = new CancellablePreference(getActivity());
+                CancellablePreference servicePref = new CancellablePreference(getPrefContext());
                 servicePref.setSelectable(false);
                 servicePref.setTitle(label);
                 servicePref.setSummary(ProcStatsPackageEntry.getFrequency(

src/com/android/settings/applications/ProcessStatsMemDetail.java

@@ -23,6 +23,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+
 import com.android.internal.app.ProcessStats;
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.InstrumentedFragment;

src/com/android/settings/applications/ProcessStatsSummary.java

@@ -17,8 +17,8 @@ package com.android.settings.applications;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.text.TextUtils;
 import android.text.format.Formatter;
 import android.text.format.Formatter.BytesResult;

src/com/android/settings/applications/ProcessStatsUi.java

@@ -19,9 +19,8 @@ package com.android.settings.applications;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceGroup;
-import android.preference.PreferenceScreen;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
 import android.util.Log;
 import android.util.TimeUtils;
 import android.view.Menu;
@@ -102,7 +101,7 @@ public class ProcessStatsUi extends ProcessStatsBase {
     }
 
     @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+    public boolean onPreferenceTreeClick(Preference preference) {
         if (!(preference instanceof ProcessStatsPreference)) {
             return false;
         }
@@ -110,7 +109,7 @@ public class ProcessStatsUi extends ProcessStatsBase {
         MemInfo memInfo = mStatsManager.getMemInfo();
         launchMemoryDetail((SettingsActivity) getActivity(), memInfo, pgp.getEntry(), true);
 
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
+        return super.onPreferenceTreeClick(preference);
     }
 
     /**
@@ -172,7 +171,7 @@ public class ProcessStatsUi extends ProcessStatsBase {
                 : memInfo.usedWeight * memInfo.weightToRam;
         for (int i = 0; i < pkgEntries.size(); i++) {
             ProcStatsPackageEntry pkg = pkgEntries.get(i);
-            ProcessStatsPreference pref = new ProcessStatsPreference(context);
+            ProcessStatsPreference pref = new ProcessStatsPreference(getPrefContext());
             pkg.retrieveUiData(context, mPm);
             pref.init(pkg, mPm, maxMemory, memInfo.weightToRam,
                     memInfo.totalScale, !mShowMax);

src/com/android/settings/applications/ResetAppsHelper.java

@@ -15,9 +15,6 @@
  */
 package com.android.settings.applications;
 
-import static android.net.NetworkPolicyManager.POLICY_NONE;
-import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
-
 import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.AppOpsManager;
@@ -38,6 +35,9 @@ import com.android.settings.R;
 
 import java.util.List;
 
+import static android.net.NetworkPolicyManager.POLICY_NONE;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+
 public class ResetAppsHelper implements DialogInterface.OnClickListener,
         DialogInterface.OnDismissListener {
 

src/com/android/settings/applications/RunningProcessesView.java

@@ -16,11 +16,6 @@
 
 package com.android.settings.applications;
 
-import android.content.res.Resources;
-import android.text.BidiFormatter;
-import com.android.internal.util.MemInfoReader;
-import com.android.settings.R;
-
 import android.app.ActivityManager;
 import android.app.Dialog;
 import android.app.Fragment;
@@ -29,19 +24,23 @@ import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.os.UserHandle;
+import android.text.BidiFormatter;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AbsListView.RecyclerListener;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.AbsListView.RecyclerListener;
+
+import com.android.internal.util.MemInfoReader;
+import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 
 import java.util.ArrayList;

src/com/android/settings/applications/RunningServiceDetails.java

@@ -6,7 +6,6 @@ import android.app.AlertDialog;
 import android.app.ApplicationErrorReport;
 import android.app.Dialog;
 import android.app.DialogFragment;
-import android.app.Fragment;
 import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;

src/com/android/settings/applications/RunningState.java

@@ -45,8 +45,8 @@ import android.util.Log;
 import android.util.SparseArray;
 
 import com.android.settings.R;
-import com.android.settingslib.applications.InterestingConfigChanges;
 import com.android.settingslib.Utils;
+import com.android.settingslib.applications.InterestingConfigChanges;
 
 import java.util.ArrayList;
 import java.util.Collections;

src/com/android/settings/applications/SpacePreference.java

@@ -17,12 +17,12 @@ package com.android.settings.applications;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-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.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
-import android.widget.Space;
+
+import com.android.settings.R;
 
 /**
  * A blank preference that has a specified height by android:layout_height.  It can be used
@@ -42,6 +42,7 @@ public class SpacePreference extends Preference {
 
     public SpacePreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
+        setLayoutResource(R.layout.space_preference);
 
         final TypedArray a = context.obtainStyledAttributes(attrs,
                 new int[] { com.android.internal.R.attr.layout_height }, defStyleAttr, defStyleRes);
@@ -53,16 +54,11 @@ public class SpacePreference extends Preference {
     }
 
     @Override
-    protected View onCreateView(ViewGroup parent) {
-        return new Space(getContext());
-    }
-
-    @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        super.onBindViewHolder(view);
 
         LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT, mHeight);
-        view.setLayoutParams(params);
+        view.itemView.setLayoutParams(params);
     }
 
 }

src/com/android/settings/applications/UsageAccessDetails.java

@@ -26,11 +26,11 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.SwitchPreference;
 import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.util.Log;
 
 import com.android.internal.logging.MetricsLogger;

src/com/android/settings/applications/WriteSettingsDetails.java

@@ -18,26 +18,23 @@ package com.android.settings.applications;
 import android.app.AlertDialog;
 import android.app.AppOpsManager;
 import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.SwitchPreference;
 import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.util.Log;
 
 import com.android.internal.logging.MetricsLogger;
-import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
 import com.android.settings.applications.AppStateWriteSettingsBridge.WriteSettingsState;
-import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
 import java.util.List;