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

Commit d8608164 authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by LuK1337
Browse files

Move Gallery2 to androidx. 

Bug: 76692459
Test: make -j Gallery2 and run on emulator
Change-Id: Ife6a5649c21464f404db3198bd6a4ba8aa901ee8
parent 76459f16

Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ LOCAL_JAVA_LIBRARIES := telephony-common 


LOCAL_STATIC_ANDROID_LIBRARIES := \

    $(ANDROID_SUPPORT_DESIGN_TARGETS) \

    androidx.fragment_fragment \

    androidx.heifwriter_heifwriter \

    android-support-fragment \

    android-support-core-ui \

    android-support-compat \

    android-support-v13

    androidx.legacy_legacy-support-core-ui \

    androidx.core_core \

    androidx.legacy_legacy-support-v13



LOCAL_STATIC_JAVA_LIBRARIES := \

    org.codeaurora.gallery.common \

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ 
                android:syncable="false"

                android:exported="false"/>

        <provider

            android:name="android.support.v4.content.FileProvider"

            android:name="androidx.core.content.FileProvider"

            android:authorities="com.android.gallery3d.fileprovider"

            android:exported="false"

            android:grantUriPermissions="true">

res/layout/ingest_activity_item_list.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
        android:choiceMode="multipleChoiceModal"

        android:stretchMode="columnWidth"  />



    <android.support.v4.view.ViewPager

    <androidx.viewpager.widget.ViewPager

        android:id="@+id/ingest_view_pager"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import android.content.res.Configuration; 
import android.net.Uri;

import android.os.Bundle;

import android.os.IBinder;

import android.support.v4.print.PrintHelper;

import androidx.print.PrintHelper;

import android.view.Menu;

import android.view.MenuItem;

import android.view.WindowManager;

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import android.app.Activity; 
import android.content.pm.PackageManager;

import android.os.Build;

import android.os.Bundle;

import android.support.v4.app.FragmentActivity;

import androidx.fragment.app.FragmentActivity;



import java.util.ArrayList;