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

Commit e1c4a906 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrating to android-x" into ub-launcher3-master

parents d7f266fe d230307a

Android.mk

+2 −3
Original line number Diff line number Diff line
@@ -37,9 +37,8 @@ LOCAL_AAPT2_ONLY := true 
LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-v4 \

    android-support-v7-recyclerview \

    android-support-dynamic-animation

    androidx.recyclerview_recyclerview \

    androidx.dynamicanimation_dynamicanimation



LOCAL_SRC_FILES := \

    $(call all-proto-files-under, protos) \

build.gradle

+9 −8
Original line number Diff line number Diff line
@@ -4,12 +4,12 @@ buildscript { 
        google()

    }

    dependencies {

        classpath 'com.android.tools.build:gradle:3.2.0-alpha12'

        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'

        classpath 'com.android.tools.build:gradle:3.2.0-beta05'

        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.6'

    }

}



final String SUPPORT_LIBS_VERSION = '28.0.0-SNAPSHOT'

final String SUPPORT_LIBS_VERSION = '1.0.0-alpha1'



apply plugin: 'com.android.application'

apply plugin: 'com.google.protobuf'
@@ -57,6 +57,8 @@ android { 
            dimension "default"

            applicationId 'com.android.launcher3'

            testApplicationId 'com.android.launcher3.tests'



            minSdkVersion 28

        }

    }
@@ -84,7 +86,7 @@ android { 


        androidTest {

            res.srcDirs = ['tests/res']

            java.srcDirs = ['tests/src']

            java.srcDirs = ['tests/src', 'tests/tapl']

            manifest.srcFile "tests/AndroidManifest-common.xml"

        }
@@ -118,9 +120,8 @@ repositories { 
}



dependencies {

    implementation "com.android.support:support-v4:${SUPPORT_LIBS_VERSION}"

    implementation "com.android.support:support-dynamic-animation:${SUPPORT_LIBS_VERSION}"

    implementation "com.android.support:recyclerview-v7:${SUPPORT_LIBS_VERSION}"

    implementation "androidx.dynamicanimation:dynamicanimation:${SUPPORT_LIBS_VERSION}"

    implementation "androidx.recyclerview:recyclerview:${SUPPORT_LIBS_VERSION}"

    implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'



    quickstepImplementation fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar')
@@ -132,7 +133,7 @@ dependencies { 
    androidTestImplementation 'com.android.support.test:runner:1.0.0'

    androidTestImplementation 'com.android.support.test:rules:1.0.0'

    androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'

    androidTestImplementation "com.android.support:support-annotations:${SUPPORT_LIBS_VERSION}"

    androidTestImplementation "androidx.annotation:annotation:${SUPPORT_LIBS_VERSION}"

}



protobuf {

proguard.flags

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
# next row when focus is on the last item of last row when using a RecyclerView

# Keep optimized and shrunk proguard to prevent issues like this when using

# support jar.

-keep class android.support.v7.widget.RecyclerView { *; }

-keep class androidx.recyclerview.widget.RecyclerView { *; }



# Preference fragments

-keep class ** extends android.preference.PreferenceFragment {

quickstep/src/com/android/launcher3/LauncherAnimationRunner.java

+5 −3
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ package com.android.launcher3; 


import static com.android.launcher3.Utilities.SINGLE_FRAME_MS;

import static com.android.launcher3.Utilities.postAsyncCallback;

import static com.android.systemui.shared.recents.utilities.Utilities.postAtFrontOfQueueAsynchronously;

import static com.android.systemui.shared.recents.utilities.Utilities

        .postAtFrontOfQueueAsynchronously;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -25,12 +26,13 @@ import android.animation.AnimatorSet; 
import android.annotation.TargetApi;

import android.os.Build;

import android.os.Handler;

import android.support.annotation.BinderThread;

import android.support.annotation.UiThread;



import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;

import com.android.systemui.shared.system.RemoteAnimationTargetCompat;



import androidx.annotation.BinderThread;

import androidx.annotation.UiThread;



@TargetApi(Build.VERSION_CODES.P)

public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat {

quickstep/src/com/android/quickstep/ActivityControlHelper.java

+3 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ import android.graphics.Rect; 
import android.os.Build;

import android.os.Handler;

import android.os.Looper;

import android.support.annotation.Nullable;

import android.support.annotation.UiThread;

import android.view.View;



import com.android.launcher3.BaseDraggingActivity;
@@ -77,6 +75,9 @@ import java.util.Objects; 
import java.util.function.BiPredicate;

import java.util.function.Consumer;



import androidx.annotation.Nullable;

import androidx.annotation.UiThread;



/**

 * Utility class which abstracts out the logical differences between Launcher and RecentsActivity.

 */