Depend on support lib preferences

Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e

1 files changed, 26 insertions, 14 deletions

diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index e8fbb8c332..d4a653b4c5 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.deviceinfo;
 
-import static com.android.settings.deviceinfo.StorageSettings.TAG;
-
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -38,11 +36,11 @@ import android.os.storage.StorageEventListener;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
 import android.os.storage.VolumeRecord;
-import android.preference.Preference;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceGroup;
-import android.preference.PreferenceScreen;
 import android.provider.DocumentsContract;
+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.TextUtils;
 import android.text.format.Formatter;
 import android.text.format.Formatter.BytesResult;
@@ -71,6 +69,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 
+import static com.android.settings.deviceinfo.StorageSettings.TAG;
+
 /**
  * Panel showing summary and actions for a {@link VolumeInfo#TYPE_PRIVATE}
  * storage volume.
@@ -153,7 +153,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
         addPreferencesFromResource(R.xml.device_info_storage_volume);
         getPreferenceScreen().setOrderingAsAdded(true);
 
-        mSummary = new StorageSummaryPreference(context);
+        mSummary = new StorageSummaryPreference(getPrefContext());
         mCurrentUser = mUserManager.getUserInfo(UserHandle.myUserId());
 
         mExplore = buildAction(R.string.storage_menu_explore);
@@ -242,7 +242,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
         if (mHeaderPoolIndex < mHeaderPreferencePool.size()) {
             category = mHeaderPreferencePool.get(mHeaderPoolIndex);
         } else {
-            category = new PreferenceCategory(getActivity(), null,
+            category = new PreferenceCategory(getPrefContext(), null,
                     com.android.internal.R.attr.preferenceCategoryStyle);
             mHeaderPreferencePool.add(category);
         }
@@ -270,8 +270,10 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
         }
         if (title != null) {
             item.setTitle(title);
+            item.setKey(title.toString());
         } else {
             item.setTitle(titleRes);
+            item.setKey(Integer.toString(titleRes));
         }
         item.setSummary(R.string.memory_calculating_size);
         item.userHandle = userId;
@@ -280,12 +282,12 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
     }
 
     private StorageItemPreference buildItem() {
-        final StorageItemPreference item = new StorageItemPreference(getActivity());
+        final StorageItemPreference item = new StorageItemPreference(getPrefContext());
         return item;
     }
 
     private Preference buildAction(int titleRes) {
-        final Preference pref = new Preference(getActivity());
+        final Preference pref = new Preference(getPrefContext());
         pref.setTitle(titleRes);
         return pref;
     }
@@ -390,12 +392,17 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
     }
 
     @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference pref) {
+    public boolean onPreferenceTreeClick(Preference pref) {
         // TODO: launch better intents for specific volume
 
         final int userId = (pref instanceof StorageItemPreference ?
                 ((StorageItemPreference)pref).userHandle : -1);
-        final int itemTitleId = pref.getTitleRes();
+        int itemTitleId;
+        try {
+            itemTitleId = Integer.parseInt(pref.getKey());
+        } catch (NumberFormatException e) {
+            itemTitleId = 0;
+        }
         Intent intent = null;
         switch (itemTitleId) {
             case R.string.storage_detail_apps: {
@@ -459,7 +466,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
             }
             return true;
         }
-        return super.onPreferenceTreeClick(preferenceScreen, pref);
+        return super.onPreferenceTreeClick(pref);
     }
 
     private final MeasurementReceiver mReceiver = new MeasurementReceiver() {
@@ -473,7 +480,12 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
         for (int i = 0; i < mItemPoolIndex; ++i) {
             StorageItemPreference item = mItemPreferencePool.get(i);
             final int userId = item.userHandle;
-            final int itemTitleId = item.getTitleRes();
+            int itemTitleId;
+            try {
+                itemTitleId = Integer.parseInt(item.getKey());
+            } catch (NumberFormatException e) {
+                itemTitleId = 0;
+            }
             switch (itemTitleId) {
                 case R.string.storage_detail_apps: {
                     updatePreference(item, details.appsSize.get(userId));