Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e273ca9e authored by Wang Han's avatar Wang Han Committed by LuK1337
Browse files

Gallery2: Migrate remaining bits to AndroidX 

Change-Id: I2cfb6152e90516cf8acedb1dbd5c45fdbbfb04d1
parent d8608164

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -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 \

proguard.flags

+0 −7
Original line number Diff line number Diff line
@@ -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

res/layout/gallery_main.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

res/layout/toolbar.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

src/com/android/gallery3d/app/GalleryActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -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 {