Merge "Migrate libphotoviewer to androidx"
diff --git a/Android.bp b/Android.bp
index 195df8a..1c7858f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,14 +18,14 @@
android_library {
name: "libphotoviewer_appcompat",
- libs: ["android-support-annotations"],
+ libs: ["androidx.annotation_annotation"],
static_libs: [
- "android-support-compat",
- "android-support-core-ui",
- "android-support-core-utils",
- "android-support-fragment",
- "android-support-v7-appcompat",
+ "androidx.core_core",
+ "androidx.legacy_legacy-support-core-ui",
+ "androidx.legacy_legacy-support-core-utils",
+ "androidx.fragment_fragment",
+ "androidx.appcompat_appcompat",
],
sdk_version: "current",
@@ -47,13 +47,13 @@
android_library {
name: "libphotoviewer",
- libs: ["android-support-annotations"],
+ libs: ["androidx.annotation_annotation"],
static_libs: [
- "android-support-compat",
- "android-support-core-ui",
- "android-support-core-utils",
- "android-support-fragment",
+ "androidx.core_core",
+ "androidx.legacy_legacy-support-core-ui",
+ "androidx.legacy_legacy-support-core-utils",
+ "androidx.fragment_fragment",
],
sdk_version: "current",
diff --git a/activity/src/com/android/ex/photo/PhotoViewActivity.java b/activity/src/com/android/ex/photo/PhotoViewActivity.java
index 7b53918..5dd8171 100644
--- a/activity/src/com/android/ex/photo/PhotoViewActivity.java
+++ b/activity/src/com/android/ex/photo/PhotoViewActivity.java
@@ -20,8 +20,8 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
import android.view.Menu;
import android.view.MenuItem;
diff --git a/appcompat/src/com/android/ex/photo/ActionBarWrapper.java b/appcompat/src/com/android/ex/photo/ActionBarWrapper.java
index ae62197..621e2a8 100644
--- a/appcompat/src/com/android/ex/photo/ActionBarWrapper.java
+++ b/appcompat/src/com/android/ex/photo/ActionBarWrapper.java
@@ -2,7 +2,7 @@
import android.graphics.drawable.Drawable;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
/**
* Wrapper around {@link ActionBar}.
diff --git a/appcompat/src/com/android/ex/photo/PhotoViewActivity.java b/appcompat/src/com/android/ex/photo/PhotoViewActivity.java
index a5c4a43..919badd 100644
--- a/appcompat/src/com/android/ex/photo/PhotoViewActivity.java
+++ b/appcompat/src/com/android/ex/photo/PhotoViewActivity.java
@@ -20,8 +20,8 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
diff --git a/sample/Android.bp b/sample/Android.bp
index 757fa00..389032e 100644
--- a/sample/Android.bp
+++ b/sample/Android.bp
@@ -18,13 +18,13 @@
android_app {
name: "PhotoViewerSample",
- libs: ["android-support-annotations"],
+ libs: ["androidx.annotation_annotation"],
static_libs: [
- "android-support-compat",
- "android-support-core-ui",
- "android-support-core-utils",
- "android-support-fragment",
+ "androidx.core_core",
+ "androidx.legacy_legacy-support-core-ui",
+ "androidx.legacy_legacy-support-core-utils",
+ "androidx.fragment_fragment",
"libphotoviewer",
],
@@ -42,15 +42,15 @@
android_app {
name: "AppcompatPhotoViewerSample",
- libs: ["android-support-annotations"],
+ libs: ["androidx.annotation_annotation"],
static_libs: [
- "android-support-compat",
- "android-support-core-ui",
- "android-support-core-utils",
- "android-support-fragment",
- "android-support-media-compat",
- "android-support-v7-appcompat",
+ "androidx.core_core",
+ "androidx.legacy_legacy-support-core-ui",
+ "androidx.legacy_legacy-support-core-utils",
+ "androidx.fragment_fragment",
+ "androidx.media_media",
+ "androidx.appcompat_appcompat",
"libphotoviewer_appcompat",
],
diff --git a/src/com/android/ex/photo/ActionBarInterface.java b/src/com/android/ex/photo/ActionBarInterface.java
index b292b2b..3c21b56 100644
--- a/src/com/android/ex/photo/ActionBarInterface.java
+++ b/src/com/android/ex/photo/ActionBarInterface.java
@@ -1,12 +1,12 @@
package com.android.ex.photo;
import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
/**
* Wrapper activity for an action bar. This wraps either a {@link android.app.ActionBar} or
- * {@link android.support.v7.app.ActionBar}.
+ * {@link androidx.appcompat.app.ActionBar}.
*/
public interface ActionBarInterface {
diff --git a/src/com/android/ex/photo/PhotoViewCallbacks.java b/src/com/android/ex/photo/PhotoViewCallbacks.java
index ca2afca..0d2d8d3 100644
--- a/src/com/android/ex/photo/PhotoViewCallbacks.java
+++ b/src/com/android/ex/photo/PhotoViewCallbacks.java
@@ -2,8 +2,8 @@
import android.database.Cursor;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.Loader;
+import androidx.fragment.app.Fragment;
+import androidx.loader.content.Loader;
import com.android.ex.photo.adapters.PhotoPagerAdapter;
import com.android.ex.photo.fragments.PhotoViewFragment;
diff --git a/src/com/android/ex/photo/PhotoViewController.java b/src/com/android/ex/photo/PhotoViewController.java
index 6d007a8..0face96 100644
--- a/src/com/android/ex/photo/PhotoViewController.java
+++ b/src/com/android/ex/photo/PhotoViewController.java
@@ -12,13 +12,13 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Process;
-import android.support.annotation.IdRes;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;
@@ -226,7 +226,7 @@
}
public PhotoPagerAdapter createPhotoPagerAdapter(Context context,
- android.support.v4.app.FragmentManager fm, Cursor c, float maxScale) {
+ androidx.fragment.app.FragmentManager fm, Cursor c, float maxScale) {
return new PhotoPagerAdapter(context, fm, c, maxScale, mDisplayThumbsFullScreen);
}
@@ -656,7 +656,7 @@
}
@Override
- public void onLoaderReset(android.support.v4.content.Loader<Cursor> loader) {
+ public void onLoaderReset(androidx.loader.content.Loader<Cursor> loader) {
// If the loader is reset, remove the reference in the adapter to this cursor
if (!isDestroyedCompat()) {
// This will cause a fragment transaction which can't happen if we're destroyed,
diff --git a/src/com/android/ex/photo/PhotoViewPager.java b/src/com/android/ex/photo/PhotoViewPager.java
index a18601c..4004a2a 100644
--- a/src/com/android/ex/photo/PhotoViewPager.java
+++ b/src/com/android/ex/photo/PhotoViewPager.java
@@ -18,8 +18,8 @@
package com.android.ex.photo;
import android.content.Context;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.ViewPager;
+import androidx.core.view.MotionEventCompat;
+import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
diff --git a/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java b/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
index 9967662..47cde79 100644
--- a/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
+++ b/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
@@ -19,8 +19,8 @@
import android.content.Context;
import android.database.Cursor;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
import android.util.Log;
import android.util.SparseIntArray;
import android.view.View;
diff --git a/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java b/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
index db086a7..f5518ed 100644
--- a/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
+++ b/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
@@ -18,16 +18,16 @@
package com.android.ex.photo.adapters;
import android.os.Parcelable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.util.LruCache;
-import android.support.v4.view.PagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.collection.LruCache;
+import androidx.viewpager.widget.PagerAdapter;
import android.util.Log;
import android.view.View;
/**
- * NOTE: This is a direct copy of {@link android.support.v4.app.FragmentPagerAdapter}
+ * NOTE: This is a direct copy of {@link androidx.fragment.app.FragmentPagerAdapter}
* with four very important modifications.
* <p>
* <ol>
@@ -54,7 +54,7 @@
/** A cache to store detached fragments before they are removed */
private LruCache<String, Fragment> mFragmentCache = new FragmentCache(DEFAULT_CACHE_SIZE);
- public BaseFragmentPagerAdapter(android.support.v4.app.FragmentManager fm) {
+ public BaseFragmentPagerAdapter(androidx.fragment.app.FragmentManager fm) {
mFragmentManager = fm;
}
diff --git a/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java b/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
index 8407a01..6765159 100644
--- a/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
+++ b/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
@@ -20,8 +20,8 @@
import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
-import android.support.v4.app.Fragment;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.fragment.app.Fragment;
+import androidx.collection.SimpleArrayMap;
import com.android.ex.photo.Intents;
import com.android.ex.photo.Intents.PhotoViewIntentBuilder;
@@ -39,7 +39,7 @@
protected boolean mDisplayThumbsFullScreen;
public PhotoPagerAdapter(
- Context context, android.support.v4.app.FragmentManager fm, Cursor c,
+ Context context, androidx.fragment.app.FragmentManager fm, Cursor c,
float maxScale, boolean thumbsFullScreen) {
super(context, fm, c);
mMaxScale = maxScale;
diff --git a/src/com/android/ex/photo/fragments/PhotoViewFragment.java b/src/com/android/ex/photo/fragments/PhotoViewFragment.java
index 627d728..e44e1ea 100644
--- a/src/com/android/ex/photo/fragments/PhotoViewFragment.java
+++ b/src/com/android/ex/photo/fragments/PhotoViewFragment.java
@@ -26,9 +26,9 @@
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
diff --git a/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java b/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java
index 3243364..27ad96a 100644
--- a/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java
+++ b/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java
@@ -21,7 +21,7 @@
import android.content.Context;
import android.graphics.Bitmap;
import android.net.Uri;
-import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
import android.util.DisplayMetrics;
import com.android.ex.photo.PhotoViewController;
diff --git a/src/com/android/ex/photo/loaders/PhotoPagerLoader.java b/src/com/android/ex/photo/loaders/PhotoPagerLoader.java
index 72a6be1..77c02c4 100644
--- a/src/com/android/ex/photo/loaders/PhotoPagerLoader.java
+++ b/src/com/android/ex/photo/loaders/PhotoPagerLoader.java
@@ -20,7 +20,7 @@
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
-import android.support.v4.content.CursorLoader;
+import androidx.loader.content.CursorLoader;
import com.android.ex.photo.provider.PhotoContract;
diff --git a/src/com/android/ex/photo/util/Util.java b/src/com/android/ex/photo/util/Util.java
index 13f17ec..d731307 100644
--- a/src/com/android/ex/photo/util/Util.java
+++ b/src/com/android/ex/photo/util/Util.java
@@ -2,8 +2,8 @@
import android.content.Context;
import android.os.Build;
-import android.support.v4.view.accessibility.AccessibilityEventCompat;
-import android.support.v4.view.accessibility.AccessibilityRecordCompat;
+import androidx.core.view.accessibility.AccessibilityEventCompat;
+import androidx.core.view.accessibility.AccessibilityRecordCompat;
import android.view.View;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
diff --git a/src/com/android/ex/photo/views/PhotoView.java b/src/com/android/ex/photo/views/PhotoView.java
index dfe180a..e64f0f0 100644
--- a/src/com/android/ex/photo/views/PhotoView.java
+++ b/src/com/android/ex/photo/views/PhotoView.java
@@ -28,8 +28,8 @@
import android.graphics.RectF;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
-import android.support.v4.view.GestureDetectorCompat;
-import android.support.v4.view.ScaleGestureDetectorCompat;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.core.view.ScaleGestureDetectorCompat;
import android.util.AttributeSet;
import android.view.GestureDetector.OnDoubleTapListener;
import android.view.GestureDetector.OnGestureListener;
