Gallery2: Migrate remaining bits to AndroidX

Change-Id: I2cfb6152e90516cf8acedb1dbd5c45fdbbfb04d1

9 files changed, 14 insertions, 16 deletions

diff --git a/Android.mk b/Android.mk
index bf16e4ec6..f3eab2a4b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,7 +7,8 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_JAVA_LIBRARIES := telephony-common
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    $(ANDROID_SUPPORT_DESIGN_TARGETS) \
+    com.google.android.material_material \
+    androidx.annotation_annotation \
     androidx.fragment_fragment \
     androidx.heifwriter_heifwriter \
     androidx.legacy_legacy-support-core-ui \
diff --git a/proguard.flags b/proguard.flags
index ea0d09fa2..21051bb70 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -44,13 +44,6 @@
 # Disable the warnings of using dynamic method calls in EffectsRecorder
 -dontnote com.android.camera.EffectsRecorder
 
-# Required for ActionBarSherlock
--keep class android.support.v4.app.** { *; }
--keep interface android.support.v4.app.** { *; }
--keep class com.actionbarsherlock.** { *; }
--keep interface com.actionbarsherlock.** { *; }
--keepattributes *Annotation*
-
 # Required for mp4parser
 -keep public class * implements com.coremedia.iso.boxes.Box
 
diff --git a/res/layout/gallery_main.xml b/res/layout/gallery_main.xml
index 749d5bed1..3cbc1e8d4 100755
--- a/res/layout/gallery_main.xml
+++ b/res/layout/gallery_main.xml
@@ -56,7 +56,7 @@
         </RelativeLayout>
 
         <!-- Bottom bar -->
-        <android.support.design.widget.BottomNavigationView
+        <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/bottom_navigation"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml
index 892f736e2..00270e3a1 100755
--- a/res/layout/toolbar.xml
+++ b/res/layout/toolbar.xml
@@ -28,7 +28,7 @@
   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:theme="@style/ToolbarTheme">
@@ -42,4 +42,4 @@
         android:titleTextAppearance="@style/ToolbarTitleStyle"
         android:popupTheme="@style/ToolbarPopUpTheme" />
 
-</android.support.design.widget.AppBarLayout>
+</com.google.android.material.appbar.AppBarLayout>
diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java
index 57c0db3bd..5275df808 100755
--- a/src/com/android/gallery3d/app/GalleryActivity.java
+++ b/src/com/android/gallery3d/app/GalleryActivity.java
@@ -30,7 +30,6 @@ import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.design.widget.BottomNavigationView;
 import androidx.drawerlayout.widget.DrawerLayout;
 import android.text.TextUtils;
 import android.util.Log;
@@ -62,6 +61,8 @@ import com.android.gallery3d.data.Path;
 import com.android.gallery3d.picasasource.PicasaSource;
 import com.android.gallery3d.util.GalleryUtils;
 
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+
 import java.util.Locale;
 
 public final class GalleryActivity extends AbstractGalleryActivity implements OnCancelListener {
diff --git a/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java b/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java
index baaa3e128..37bc8625f 100644
--- a/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java
@@ -33,11 +33,12 @@ import android.app.Activity;
 import android.content.res.Configuration;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+
 import org.codeaurora.gallery.R;
 import com.android.gallery3d.filtershow.FilterShowActivity;
 import com.android.gallery3d.filtershow.editors.EditorCrop;
diff --git a/src/com/android/gallery3d/filtershow/category/GeometryPanel.java b/src/com/android/gallery3d/filtershow/category/GeometryPanel.java
index 7772f1838..e6e0c7a9a 100755
--- a/src/com/android/gallery3d/filtershow/category/GeometryPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/GeometryPanel.java
@@ -31,13 +31,14 @@ package com.android.gallery3d.filtershow.category;
 
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+
 import com.android.gallery3d.filtershow.FilterShowActivity;
 import com.android.gallery3d.filtershow.filters.FilterRepresentation;
 import com.android.gallery3d.filtershow.filters.FiltersManager;
diff --git a/src/com/android/gallery3d/filtershow/category/StraightenPanel.java b/src/com/android/gallery3d/filtershow/category/StraightenPanel.java
index 1ac5dc489..6d6919ff5 100644
--- a/src/com/android/gallery3d/filtershow/category/StraightenPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/StraightenPanel.java
@@ -31,9 +31,10 @@ package com.android.gallery3d.filtershow.category;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.android.gallery3d.filtershow.FilterShowActivity;
 import com.android.gallery3d.filtershow.editors.Editor;
 
diff --git a/src/com/android/gallery3d/filtershow/category/TrueScannerPanel.java b/src/com/android/gallery3d/filtershow/category/TrueScannerPanel.java
index 611b9cf2a..97c8c4b02 100644
--- a/src/com/android/gallery3d/filtershow/category/TrueScannerPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/TrueScannerPanel.java
@@ -34,7 +34,7 @@ import android.app.Activity;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.view.View;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.android.gallery3d.filtershow.FilterShowActivity;
 import com.android.gallery3d.filtershow.editors.TrueScannerEditor;