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

Commit 913fd7fa authored by Aurimas Liutikas's avatar Aurimas Liutikas
Browse files

Revert "Revert "Move Gallery2 to androidx."" 

This reverts commit fac21a09.

We can reland this change now that prebuilts/sdk has been updated with the new SDK. (ag/3818779)

Bug: 76692459
Change-Id: I73f2ed3d61bc8756d1b7e4ea0e54c58227d5d506
parent fac21a09

Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ include $(CLEAR_VARS) 
LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-fragment \

    android-support-core-ui \

    android-support-compat \

    android-support-v13

    androidx.fragment_fragment \

    androidx.legacy_legacy-support-core-ui \

    androidx.core_core \

    androidx.legacy_legacy-support-v13



LOCAL_STATIC_JAVA_LIBRARIES := \

    com.android.gallery3d.common2 \

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.Window;

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+5 −5
Original line number Diff line number Diff line
@@ -42,11 +42,11 @@ import android.os.Bundle; 
import android.os.CancellationSignal;

import android.os.Handler;

import android.os.IBinder;

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 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.util.DisplayMetrics;

import android.util.Log;

import android.util.TypedValue;

src/com/android/gallery3d/filtershow/category/CategoryPanel.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.category; 
import android.app.Activity;

import android.graphics.Rect;

import android.os.Bundle;

import android.support.v4.app.Fragment;

import androidx.fragment.app.Fragment;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;