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

Commit f43527d5 authored by Shan Huang's avatar Shan Huang Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Rename BackEvent to BackMotionEvent in... 

Merge "DO NOT MERGE Rename BackEvent to BackMotionEvent in LauncherBackAnimationController." into tm-qpr-dev
parents bdfc07f1 81f7d0bb

quickstep/src/com/android/quickstep/LauncherBackAnimationController.java

+4 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.view.SurfaceControl; 
import android.view.animation.AnimationUtils;

import android.view.animation.Interpolator;

import android.window.BackEvent;

import android.window.BackMotionEvent;

import android.window.BackProgressAnimator;

import android.window.IOnBackInvokedCallback;
@@ -134,14 +135,14 @@ public class LauncherBackAnimationController { 
            }



            @Override

            public void onBackProgressed(BackEvent backEvent) {

            public void onBackProgressed(BackMotionEvent backEvent) {

                handler.post(() -> {

                    mProgressAnimator.onBackProgressed(backEvent);

                });

            }



            @Override

            public void onBackStarted(BackEvent backEvent) {

            public void onBackStarted(BackMotionEvent backEvent) {

                handler.post(() -> {

                    startBack(backEvent);

                    mProgressAnimator.onBackStarted(backEvent, event -> {
@@ -185,7 +186,7 @@ public class LauncherBackAnimationController { 
        mBackCallback = null;

    }



    private void startBack(BackEvent backEvent) {

    private void startBack(BackMotionEvent backEvent) {

        mBackInProgress = true;

        RemoteAnimationTarget appTarget = backEvent.getDepartingAnimationTarget();