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

Commit 1d6c6dab authored by Aurimas Liutikas's avatar Aurimas Liutikas
Browse files

Migrate EasterEgg, JankBench, UiBench to androidx 

Bug: 76692459
Test: make -j EasterEgg JankBench UiBench
Change-Id: Id9bed936dd1cb1cb4e1c0792618c9a3d608c1fb8
parent 436f2235

packages/EasterEgg/Android.mk

+7 −7
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    jsr305



LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-v4 \

    android-support-v13 \

    android-support-dynamic-animation \

    android-support-v7-recyclerview \

    android-support-v7-preference \

    android-support-v7-appcompat \

    android-support-v14-preference

    androidx.legacy_legacy-support-v4 \

    androidx.legacy_legacy-support-v13 \

    androidx.dynamicanimation_dynamicanimation \

    androidx.recyclerview_recyclerview \

    androidx.preference_preference \

    androidx.appcompat_appcompat \

    androidx.legacy_legacy-preference-v14



LOCAL_USE_AAPT2 := true

packages/EasterEgg/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ Copyright (C) 2016 The Android Open Source Project 


        <!-- FileProvider for sending pictures -->

        <provider

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

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

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

                android:grantUriPermissions="true"

                android:exported="false">

packages/EasterEgg/res/layout/neko_activity.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Copyright (C) 2016 The Android Open Source Project 
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

             android:layout_width="match_parent"

             android:layout_height="match_parent">

    <android.support.v7.widget.RecyclerView

    <androidx.recyclerview.widget.RecyclerView

        android:id="@+id/holder"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

packages/EasterEgg/src/com/android/egg/neko/NekoDialog.java

+3 −3
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 


package com.android.egg.neko;



import android.support.annotation.NonNull;

import androidx.annotation.NonNull;

import android.app.Dialog;

import android.content.Context;

import android.support.v7.widget.GridLayoutManager;

import android.support.v7.widget.RecyclerView;

import androidx.recyclerview.widget.GridLayoutManager;

import androidx.recyclerview.widget.RecyclerView;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

packages/EasterEgg/src/com/android/egg/neko/NekoLand.java

+3 −3
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ import android.net.Uri; 
import android.os.Bundle;

import android.os.Environment;

import android.provider.MediaStore.Images;

import android.support.v4.content.FileProvider;

import android.support.v7.widget.GridLayoutManager;

import android.support.v7.widget.RecyclerView;

import androidx.core.content.FileProvider;

import androidx.recyclerview.widget.GridLayoutManager;

import androidx.recyclerview.widget.RecyclerView;

import android.util.Log;

import android.view.ContextThemeWrapper;

import android.view.LayoutInflater;