Migrate StorageManager to androidx.
am: c8243c18d0
Change-Id: I5fd4b83e75f9b78f49553eeb8fed3ce23a672184
diff --git a/Android.mk b/Android.mk
index f7bddf2..ae6b5f4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,10 +24,10 @@
LOCAL_PRIVILEGED_MODULE := true
LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v14-preference \
- android-support-v7-appcompat \
- android-support-v7-preference \
- android-support-v7-recyclerview
+ androidx.legacy_legacy-preference-v14 \
+ androidx.appcompat_appcompat \
+ androidx.preference_preference \
+ androidx.recyclerview_recyclerview
LOCAL_USE_AAPT2 := true
diff --git a/proguard.cfg b/proguard.cfg
index b4e8c79..799e737 100644
--- a/proguard.cfg
+++ b/proguard.cfg
@@ -5,19 +5,6 @@
-verbose
-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.preference.Preference
--keep public class android.support.v7.preference.Preference {
- public <init>(android.content.Context, android.util.AttributeSet);
-}
--keep public class * extends android.support.v7.preference.Preference {
- public <init>(android.content.Context, android.util.AttributeSet);
-}
-
-keepclasseswithmembernames class * {
native <methods>;
}
@@ -43,9 +30,9 @@
public static final android.os.Parcelable$Creator *;
}
--keep @android.support.annotation.Keep class *
+-keep @androidx.annotation.Keep class *
-keepclassmembers class * {
- @android.support.annotation.Keep *;
+ @androidx.annotation.Keep *;
}
-keep class com.android.storagemanager.overlay.FeatureFactoryImpl
diff --git a/robotests/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroupTest.java b/robotests/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroupTest.java
index 55ee9b3..dd2f0cb 100644
--- a/robotests/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroupTest.java
+++ b/robotests/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroupTest.java
@@ -18,8 +18,8 @@
import static com.google.common.truth.Truth.assertThat;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.storagemanager.testing.TestingConstants;
import java.util.ArrayList;
import java.util.List;
diff --git a/robotests/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroupTest.java b/robotests/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroupTest.java
index bec2f2b..503678c 100644
--- a/robotests/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroupTest.java
+++ b/robotests/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroupTest.java
@@ -16,14 +16,17 @@
package com.android.storagemanager.deletionhelper;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.LinearLayout;
+import androidx.preference.PreferenceViewHolder;
+import com.android.storagemanager.R;
import com.android.storagemanager.deletionhelper.DeletionType.LoadingStatus;
import com.android.storagemanager.testing.TestingConstants;
-import com.android.storagemanager.R;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,9 +37,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
@RunWith(RobolectricTestRunner.class)
@Config(manifest = TestingConstants.MANIFEST, sdk = TestingConstants.SDK_VERSION)
public class CollapsibleCheckboxPreferenceGroupTest {
diff --git a/robotests/src/com/android/storagemanager/deletionhelper/DeletionHelperSettingsTest.java b/robotests/src/com/android/storagemanager/deletionhelper/DeletionHelperSettingsTest.java
index 388f8b8..edbe257 100644
--- a/robotests/src/com/android/storagemanager/deletionhelper/DeletionHelperSettingsTest.java
+++ b/robotests/src/com/android/storagemanager/deletionhelper/DeletionHelperSettingsTest.java
@@ -33,7 +33,7 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.os.storage.StorageManager;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceScreen;
import com.android.storagemanager.testing.StorageManagerRobolectricTestRunner;
import com.android.storagemanager.testing.TestingConstants;
diff --git a/robotests/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroupTest.java b/robotests/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroupTest.java
index c4b5db7..b44763b 100644
--- a/robotests/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroupTest.java
+++ b/robotests/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroupTest.java
@@ -25,7 +25,7 @@
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
import com.android.storagemanager.testing.StorageManagerRobolectricTestRunner;
import com.android.storagemanager.testing.TestingConstants;
diff --git a/robotests/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreferenceTest.java b/robotests/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreferenceTest.java
index f731cea..24ebef0 100644
--- a/robotests/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreferenceTest.java
+++ b/robotests/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreferenceTest.java
@@ -17,7 +17,7 @@
package com.android.storagemanager.deletionhelper;
import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/robotests/src/com/android/storagemanager/utils/PreferenceListCacheTest.java b/robotests/src/com/android/storagemanager/utils/PreferenceListCacheTest.java
index 76b4278..f26b6a3 100644
--- a/robotests/src/com/android/storagemanager/utils/PreferenceListCacheTest.java
+++ b/robotests/src/com/android/storagemanager/utils/PreferenceListCacheTest.java
@@ -17,8 +17,8 @@
package com.android.storagemanager.utils;
import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.storagemanager.testing.TestingConstants;
import org.junit.Before;
import org.junit.Test;
@@ -32,8 +32,6 @@
import org.robolectric.annotation.Config;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
diff --git a/src/com/android/storagemanager/automatic/NotificationController.java b/src/com/android/storagemanager/automatic/NotificationController.java
index 58c99d8..a2e2081 100644
--- a/src/com/android/storagemanager/automatic/NotificationController.java
+++ b/src/com/android/storagemanager/automatic/NotificationController.java
@@ -27,8 +27,8 @@
import android.content.res.Resources;
import android.os.SystemProperties;
import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.os.BuildCompat;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.os.BuildCompat;
import com.android.storagemanager.R;
diff --git a/src/com/android/storagemanager/deletionhelper/AppDeletionPreference.java b/src/com/android/storagemanager/deletionhelper/AppDeletionPreference.java
index cd0ce28..dfd0419 100644
--- a/src/com/android/storagemanager/deletionhelper/AppDeletionPreference.java
+++ b/src/com/android/storagemanager/deletionhelper/AppDeletionPreference.java
@@ -15,7 +15,7 @@
package com.android.storagemanager.deletionhelper;
import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.PreferenceViewHolder;
import android.text.format.DateUtils;
import com.android.storagemanager.R;
import com.android.storagemanager.deletionhelper.AppsAsyncLoader.PackageInfo;
diff --git a/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroup.java b/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroup.java
index bfca07e..0010b05 100644
--- a/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroup.java
+++ b/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroup.java
@@ -17,9 +17,9 @@
package com.android.storagemanager.deletionhelper;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.text.format.Formatter;
import android.util.AttributeSet;
import com.android.internal.logging.MetricsLogger;
diff --git a/src/com/android/storagemanager/deletionhelper/AppsAsyncLoader.java b/src/com/android/storagemanager/deletionhelper/AppsAsyncLoader.java
index 1142b69..eb892a5 100644
--- a/src/com/android/storagemanager/deletionhelper/AppsAsyncLoader.java
+++ b/src/com/android/storagemanager/deletionhelper/AppsAsyncLoader.java
@@ -26,7 +26,7 @@
import android.graphics.drawable.Drawable;
import android.os.SystemProperties;
import android.os.UserHandle;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import android.text.format.DateUtils;
import android.util.ArrayMap;
import android.util.ArraySet;
diff --git a/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroup.java b/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroup.java
index 51a969d..c5de8c6 100644
--- a/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroup.java
+++ b/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroup.java
@@ -19,10 +19,10 @@
import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.view.View;
diff --git a/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java b/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java
index 1a63b17..93f2df3 100644
--- a/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java
+++ b/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java
@@ -23,10 +23,10 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.storage.StorageManager;
-import android.support.annotation.VisibleForTesting;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.text.format.Formatter;
import android.view.LayoutInflater;
import android.view.Menu;
diff --git a/src/com/android/storagemanager/deletionhelper/DeletionPreference.java b/src/com/android/storagemanager/deletionhelper/DeletionPreference.java
index 0dd8fb0..5ae27d4 100644
--- a/src/com/android/storagemanager/deletionhelper/DeletionPreference.java
+++ b/src/com/android/storagemanager/deletionhelper/DeletionPreference.java
@@ -17,10 +17,10 @@
package com.android.storagemanager.deletionhelper;
import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.view.View;
diff --git a/src/com/android/storagemanager/deletionhelper/DeletionType.java b/src/com/android/storagemanager/deletionhelper/DeletionType.java
index 47cd479..87cc618 100644
--- a/src/com/android/storagemanager/deletionhelper/DeletionType.java
+++ b/src/com/android/storagemanager/deletionhelper/DeletionType.java
@@ -18,7 +18,7 @@
import android.app.Activity;
import android.os.Bundle;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/**
* Helper for the Deletion Helper which can query, clear out, and visualize deletable data.
diff --git a/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroup.java b/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroup.java
index 8213170..e595d07 100644
--- a/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroup.java
+++ b/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroup.java
@@ -20,8 +20,8 @@
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
import android.text.format.Formatter;
import android.util.AttributeSet;
diff --git a/src/com/android/storagemanager/deletionhelper/DownloadsDeletionType.java b/src/com/android/storagemanager/deletionhelper/DownloadsDeletionType.java
index e8cf1df..e82d189 100644
--- a/src/com/android/storagemanager/deletionhelper/DownloadsDeletionType.java
+++ b/src/com/android/storagemanager/deletionhelper/DownloadsDeletionType.java
@@ -24,7 +24,7 @@
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Environment;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.ArraySet;
import com.android.internal.logging.MetricsLogger;
diff --git a/src/com/android/storagemanager/deletionhelper/DownloadsFilePreference.java b/src/com/android/storagemanager/deletionhelper/DownloadsFilePreference.java
index c7d2570..9de43fd 100644
--- a/src/com/android/storagemanager/deletionhelper/DownloadsFilePreference.java
+++ b/src/com/android/storagemanager/deletionhelper/DownloadsFilePreference.java
@@ -17,7 +17,7 @@
package com.android.storagemanager.deletionhelper;
import android.content.Context;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
import android.text.format.DateUtils;
import com.android.storagemanager.utils.IconProvider;
diff --git a/src/com/android/storagemanager/deletionhelper/FetchDownloadsLoader.java b/src/com/android/storagemanager/deletionhelper/FetchDownloadsLoader.java
index f848ec4..5826baf 100644
--- a/src/com/android/storagemanager/deletionhelper/FetchDownloadsLoader.java
+++ b/src/com/android/storagemanager/deletionhelper/FetchDownloadsLoader.java
@@ -21,7 +21,7 @@
import android.media.ThumbnailUtils;
import android.os.SystemProperties;
import android.provider.MediaStore;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import android.text.format.DateUtils;
import com.android.storagemanager.utils.AsyncLoader;
diff --git a/src/com/android/storagemanager/deletionhelper/GaugePreference.java b/src/com/android/storagemanager/deletionhelper/GaugePreference.java
index 3ffdbac..9b71ebf 100644
--- a/src/com/android/storagemanager/deletionhelper/GaugePreference.java
+++ b/src/com/android/storagemanager/deletionhelper/GaugePreference.java
@@ -17,7 +17,7 @@
package com.android.storagemanager.deletionhelper;
import android.content.Context;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
import android.util.AttributeSet;
import com.android.storagemanager.R;
diff --git a/src/com/android/storagemanager/deletionhelper/NestedDeletionPreference.java b/src/com/android/storagemanager/deletionhelper/NestedDeletionPreference.java
index 47656d9..6f8fdd0 100644
--- a/src/com/android/storagemanager/deletionhelper/NestedDeletionPreference.java
+++ b/src/com/android/storagemanager/deletionhelper/NestedDeletionPreference.java
@@ -17,8 +17,8 @@
package com.android.storagemanager.deletionhelper;
import android.content.Context;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.PreferenceViewHolder;
import android.text.format.Formatter;
import android.view.View;
import android.widget.CheckBox;
diff --git a/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreference.java b/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreference.java
index 28139dc..d87a338 100644
--- a/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreference.java
+++ b/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreference.java
@@ -18,8 +18,8 @@
import android.content.Context;
import android.os.Handler;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.text.format.Formatter;
diff --git a/src/com/android/storagemanager/deletionhelper/StorageManagerUpsellDialog.java b/src/com/android/storagemanager/deletionhelper/StorageManagerUpsellDialog.java
index af85277..00521a9 100644
--- a/src/com/android/storagemanager/deletionhelper/StorageManagerUpsellDialog.java
+++ b/src/com/android/storagemanager/deletionhelper/StorageManagerUpsellDialog.java
@@ -23,7 +23,7 @@
import android.content.SharedPreferences;
import android.os.Bundle;
import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import android.text.format.Formatter;
import com.android.settingslib.Utils;
diff --git a/src/com/android/storagemanager/utils/PreferenceListCache.java b/src/com/android/storagemanager/utils/PreferenceListCache.java
index 3d552d5..05cedd5 100644
--- a/src/com/android/storagemanager/utils/PreferenceListCache.java
+++ b/src/com/android/storagemanager/utils/PreferenceListCache.java
@@ -16,8 +16,8 @@
package com.android.storagemanager.utils;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
import android.text.TextUtils;
import android.util.ArrayMap;
