Revert "Move Gallery2 to androidx."

This reverts commit c86745dd27fb93baa1ec22796bb4af207b6b6182.

Broke apps target build.

Bug: 76692459
Change-Id: I7b3529a9584d72a31b6c16ff4d4155f75d1c57f8

diff --git a/Android.mk b/Android.mk
index 68d573a..973d1ad 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -5,10 +5,10 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \

-    androidx.fragment_fragment \
-    androidx.legacy_legacy-support-core-ui \
-    androidx.core_core \
-    androidx.legacy_legacy-support-v13
+    android-support-fragment \
+    android-support-core-ui \
+    android-support-compat \
+    android-support-v13

 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     com.android.gallery3d.common2 \
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     com.android.gallery3d.common2 \

diff --git a/res/layout/ingest_activity_item_list.xml b/res/layout/ingest_activity_item_list.xml
index 2d14684..b91f0ce 100644 (file)
--- a/res/layout/ingest_activity_item_list.xml
+++ b/res/layout/ingest_activity_item_list.xml
@@ -25,7 +25,7 @@
         android:choiceMode="multipleChoiceModal"
         android:stretchMode="columnWidth"  />
 
         android:choiceMode="multipleChoiceModal"
         android:stretchMode="columnWidth"  />
 

-    <androidx.viewpager.widget.ViewPager
+    <android.support.v4.view.ViewPager

         android:id="@+id/ingest_view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/ingest_view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

diff --git a/src/com/android/gallery3d/app/AbstractGalleryActivity.java b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
index 9291556..9af1fb8 100644 (file)
--- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java
+++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
@@ -32,7 +32,7 @@ import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;

-import androidx.print.PrintHelper;
+import android.support.v4.print.PrintHelper;

 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.Window;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.Window;

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index d0bc29a..e627a61 100644 (file)
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -42,11 +42,11 @@ import android.os.Bundle;
 import android.os.CancellationSignal;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.CancellationSignal;
 import android.os.Handler;
 import android.os.IBinder;

-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.print.PrintHelper;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.print.PrintHelper;

 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;

diff --git a/src/com/android/gallery3d/filtershow/category/CategoryPanel.java b/src/com/android/gallery3d/filtershow/category/CategoryPanel.java
index c7aadfa..fb51bf5 100644 (file)
--- a/src/com/android/gallery3d/filtershow/category/CategoryPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/CategoryPanel.java
@@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.category;
 import android.app.Activity;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.app.Activity;
 import android.graphics.Rect;
 import android.os.Bundle;

-import androidx.fragment.app.Fragment;
+import android.support.v4.app.Fragment;

 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/src/com/android/gallery3d/filtershow/category/MainPanel.java b/src/com/android/gallery3d/filtershow/category/MainPanel.java
index 75574c3..082bf14 100644 (file)
--- a/src/com/android/gallery3d/filtershow/category/MainPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/MainPanel.java
@@ -17,8 +17,8 @@
 package com.android.gallery3d.filtershow.category;
 
 import android.os.Bundle;
 package com.android.gallery3d.filtershow.category;
 
 import android.os.Bundle;

-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;

 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/src/com/android/gallery3d/filtershow/editors/EditorPanel.java b/src/com/android/gallery3d/filtershow/editors/EditorPanel.java
index 51e01d0..a60b672 100644 (file)
--- a/src/com/android/gallery3d/filtershow/editors/EditorPanel.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorPanel.java
@@ -18,8 +18,8 @@ package com.android.gallery3d.filtershow.editors;
 
 import android.app.Activity;
 import android.os.Bundle;
 
 import android.app.Activity;
 import android.os.Bundle;

-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;

 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index e2f21f3..2022ffd 100644 (file)
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -32,7 +32,7 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Shader;
 import android.graphics.drawable.NinePatchDrawable;
 import android.graphics.RectF;
 import android.graphics.Shader;
 import android.graphics.drawable.NinePatchDrawable;

-import androidx.core.widget.EdgeEffectCompat;
+import android.support.v4.widget.EdgeEffectCompat;

 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.GestureDetector;

diff --git a/src/com/android/gallery3d/filtershow/info/InfoPanel.java b/src/com/android/gallery3d/filtershow/info/InfoPanel.java
index 1d8751d..3a66578 100644 (file)
--- a/src/com/android/gallery3d/filtershow/info/InfoPanel.java
+++ b/src/com/android/gallery3d/filtershow/info/InfoPanel.java
@@ -20,7 +20,7 @@ import android.graphics.Bitmap;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;

-import androidx.fragment.app.DialogFragment;
+import android.support.v4.app.DialogFragment;

 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java b/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java
index 81de6cf..63a6165 100644 (file)
--- a/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java
+++ b/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java
@@ -17,7 +17,7 @@
 package com.android.gallery3d.filtershow.presets;
 
 import android.os.Bundle;
 package com.android.gallery3d.filtershow.presets;
 
 import android.os.Bundle;

-import androidx.fragment.app.DialogFragment;
+import android.support.v4.app.DialogFragment;

 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/src/com/android/gallery3d/filtershow/state/StatePanel.java b/src/com/android/gallery3d/filtershow/state/StatePanel.java
index 039bc2c..95c2df9 100644 (file)
--- a/src/com/android/gallery3d/filtershow/state/StatePanel.java
+++ b/src/com/android/gallery3d/filtershow/state/StatePanel.java
@@ -17,7 +17,7 @@
 package com.android.gallery3d.filtershow.state;
 
 import android.os.Bundle;
 package com.android.gallery3d.filtershow.state;
 
 import android.os.Bundle;

-import androidx.fragment.app.Fragment;
+import android.support.v4.app.Fragment;

 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java
index 9f726b4..b42c9f3 100644 (file)
--- a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java
+++ b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java
@@ -22,7 +22,7 @@ import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;

-import androidx.fragment.app.DialogFragment;
+import android.support.v4.app.DialogFragment;

 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;

diff --git a/src/com/android/gallery3d/ingest/IngestActivity.java b/src/com/android/gallery3d/ingest/IngestActivity.java
index b0b3e05..46173d6 100644 (file)
--- a/src/com/android/gallery3d/ingest/IngestActivity.java
+++ b/src/com/android/gallery3d/ingest/IngestActivity.java
@@ -42,7 +42,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;

-import androidx.viewpager.widget.ViewPager;
+import android.support.v4.view.ViewPager;

 import android.util.SparseBooleanArray;
 import android.view.ActionMode;
 import android.view.Menu;
 import android.util.SparseBooleanArray;
 import android.view.ActionMode;
 import android.view.Menu;

diff --git a/src/com/android/gallery3d/ingest/IngestService.java b/src/com/android/gallery3d/ingest/IngestService.java
index 262e410..98aa7f5 100644 (file)
--- a/src/com/android/gallery3d/ingest/IngestService.java
+++ b/src/com/android/gallery3d/ingest/IngestService.java
@@ -37,7 +37,7 @@ import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
 import android.os.SystemClock;
 import android.os.Build;
 import android.os.IBinder;
 import android.os.SystemClock;

-import androidx.core.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;

 import android.util.SparseBooleanArray;
 import android.widget.Adapter;
 
 import android.util.SparseBooleanArray;
 import android.widget.Adapter;
 

diff --git a/src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java b/src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java
index 6c1dd9f..9fe650c 100644 (file)
--- a/src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java
+++ b/src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java
@@ -25,7 +25,7 @@ import com.android.gallery3d.ingest.ui.MtpFullscreenView;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;

-import androidx.viewpager.widget.PagerAdapter;
+import android.support.v4.view.PagerAdapter;

 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java
index 22b3b57..1ace718 100644 (file)
--- a/src/com/android/gallery3d/ui/MenuExecutor.java
+++ b/src/com/android/gallery3d/ui/MenuExecutor.java
@@ -26,7 +26,7 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.Message;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.Message;

-import androidx.print.PrintHelper;
+import android.support.v4.print.PrintHelper;

 import android.view.Menu;
 import android.view.MenuItem;
 
 import android.view.Menu;
 import android.view.MenuItem;
 

diff --git a/src/com/android/gallery3d/ui/TileImageView.java b/src/com/android/gallery3d/ui/TileImageView.java
index 36500a0..1103ed8 100644 (file)
--- a/src/com/android/gallery3d/ui/TileImageView.java
+++ b/src/com/android/gallery3d/ui/TileImageView.java
@@ -21,7 +21,7 @@ import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;

-import androidx.collection.LongSparseArray;
+import android.support.v4.util.LongSparseArray;

 import android.util.DisplayMetrics;
 import android.view.WindowManager;
 
 import android.util.DisplayMetrics;
 import android.view.WindowManager;
 

diff --git a/src/com/android/gallery3d/util/AccessibilityUtils.java b/src/com/android/gallery3d/util/AccessibilityUtils.java
index 80244d3..9df8e4e 100644 (file)
--- a/src/com/android/gallery3d/util/AccessibilityUtils.java
+++ b/src/com/android/gallery3d/util/AccessibilityUtils.java
@@ -17,7 +17,7 @@
 package com.android.gallery3d.util;
 
 import android.content.Context;
 package com.android.gallery3d.util;
 
 import android.content.Context;

-import androidx.core.view.accessibility.AccessibilityRecordCompat;
+import android.support.v4.view.accessibility.AccessibilityRecordCompat;

 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;

diff --git a/src/com/android/photos/GalleryActivity.java b/src/com/android/photos/GalleryActivity.java
index 51c78d6..f3279fe 100644 (file)
--- a/src/com/android/photos/GalleryActivity.java
+++ b/src/com/android/photos/GalleryActivity.java
@@ -23,8 +23,8 @@ import android.app.Fragment;
 import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.os.Bundle;
 import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.os.Bundle;

-import androidx.legacy.app.FragmentPagerAdapter;
-import androidx.viewpager.widget.ViewPager;
+import android.support.v13.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;

 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.ViewGroup;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.ViewGroup;

diff --git a/src/com/android/photos/views/GalleryThumbnailView.java b/src/com/android/photos/views/GalleryThumbnailView.java
index 2515685..e5dd6f2 100644 (file)
--- a/src/com/android/photos/views/GalleryThumbnailView.java
+++ b/src/com/android/photos/views/GalleryThumbnailView.java
@@ -20,10 +20,10 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.database.DataSetObserver;
 import android.graphics.Canvas;
 import android.content.res.TypedArray;
 import android.database.DataSetObserver;
 import android.graphics.Canvas;

-import androidx.core.view.MotionEventCompat;
-import androidx.core.view.VelocityTrackerCompat;
-import androidx.core.view.ViewCompat;
-import androidx.core.widget.EdgeEffectCompat;
+import android.support.v4.view.MotionEventCompat;
+import android.support.v4.view.VelocityTrackerCompat;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.widget.EdgeEffectCompat;

 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.SparseArray;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.SparseArray;

diff --git a/src/com/android/photos/views/TiledImageRenderer.java b/src/com/android/photos/views/TiledImageRenderer.java
index e3b7f38..c4e493b 100644 (file)
--- a/src/com/android/photos/views/TiledImageRenderer.java
+++ b/src/com/android/photos/views/TiledImageRenderer.java
@@ -20,7 +20,7 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Bitmap;
 import android.graphics.Rect;
 import android.graphics.RectF;

-import androidx.collection.LongSparseArray;
+import android.support.v4.util.LongSparseArray;

 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Pools.Pool;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Pools.Pool;