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

Commit af7ff567 authored by Andy Wickham's avatar Andy Wickham Committed by Android (Google) Code Review
Browse files

Merge changes from topics "awickham-api-cleanup", "keyboard-on-back" into main 

* changes:
  Cleanup API checks for P, Q, and R.
  Add a WindowInsetsAnimationCallback to listen to IME changes.
  Update minSdk to 30.
parents 0961a69f b922dccb

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
<manifest

    xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.launcher3">

    <uses-sdk android:targetSdkVersion="33" android:minSdkVersion="26"/>

    <uses-sdk android:targetSdkVersion="33" android:minSdkVersion="30"/>

    <!--

    Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.

    Refer comments around specific entries on how to extend individual components.

build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ android { 
    buildToolsVersion BUILD_TOOLS_VERSION



    defaultConfig {

        minSdkVersion 26

        targetSdkVersion 30

        minSdkVersion 30

        targetSdkVersion 33

        versionCode 1

        versionName "1.0"

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

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,7 @@ import static com.android.systemui.shared.recents.utilities.Utilities.postAtFron 
import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;

import android.annotation.TargetApi;

import android.content.Context;

import android.os.Build;

import android.os.Handler;

import android.os.RemoteException;

import android.view.IRemoteAnimationFinishedCallback;
@@ -57,7 +55,6 @@ import java.lang.ref.WeakReference; 
 * the runner implementation.  When this animation manager is destroyed, we remove the Launcher

 * reference to the runner, leaving only the weak ref from the runner.

 */

@TargetApi(Build.VERSION_CODES.P)

public class LauncherAnimationRunner extends RemoteAnimationRunnerCompat {



    private static final RemoteAnimationFactory DEFAULT_FACTORY =

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

+0 −4
Original line number Diff line number Diff line
@@ -15,14 +15,10 @@ 
 */

package com.android.launcher3;



import android.annotation.TargetApi;

import android.os.Build;



import com.android.quickstep.util.ActivityInitListener;



import java.util.function.BiPredicate;



@TargetApi(Build.VERSION_CODES.P)

public class LauncherInitListener extends ActivityInitListener<Launcher> {



    /**

quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java

+0 −3
Original line number Diff line number Diff line
@@ -16,10 +16,8 @@ 


package com.android.launcher3.appprediction;



import android.annotation.TargetApi;

import android.content.Context;

import android.graphics.Canvas;

import android.os.Build;

import android.util.AttributeSet;

import android.view.LayoutInflater;

import android.view.View;
@@ -50,7 +48,6 @@ import java.util.ArrayList; 
import java.util.List;

import java.util.stream.Collectors;



@TargetApi(Build.VERSION_CODES.P)

public class PredictionRowView<T extends Context & ActivityContext>

        extends LinearLayout implements OnDeviceProfileChangeListener, FloatingHeaderRow {