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

Commit 81f7d0bb authored by Shan Huang's avatar Shan Huang
Browse files

DO NOT MERGE Rename BackEvent to BackMotionEvent in LauncherBackAnimationController. 

This cherry-picks ag/20484685 to QPR to mitigate future merge conflicts.

Bug: 238475284
Test: m -j
Change-Id: Ie13c738d0d4a10f4265fbf116ff7b4206d3bfc62
parent 5dd52965

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

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

import android.view.animation.AnimationUtils;

import android.view.animation.Interpolator;

import android.view.animation.Interpolator;

import android.window.BackEvent;

import android.window.BackEvent;

import android.window.BackMotionEvent;

import android.window.BackProgressAnimator;

import android.window.BackProgressAnimator;

import android.window.IOnBackInvokedCallback;

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

            }





            @Override

            @Override

            public void onBackProgressed(BackEvent backEvent) {

            public void onBackProgressed(BackMotionEvent backEvent) {

                handler.post(() -> {

                handler.post(() -> {

                    mProgressAnimator.onBackProgressed(backEvent);

                    mProgressAnimator.onBackProgressed(backEvent);

                });

                });

            }

            }





            @Override

            @Override

            public void onBackStarted(BackEvent backEvent) {

            public void onBackStarted(BackMotionEvent backEvent) {

                handler.post(() -> {

                handler.post(() -> {

                    startBack(backEvent);

                    startBack(backEvent);

                    mProgressAnimator.onBackStarted(backEvent, event -> {

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

        mBackCallback = null;

    }

    }





    private void startBack(BackEvent backEvent) {

    private void startBack(BackMotionEvent backEvent) {

        mBackInProgress = true;

        mBackInProgress = true;

        RemoteAnimationTarget appTarget = backEvent.getDepartingAnimationTarget();

        RemoteAnimationTarget appTarget = backEvent.getDepartingAnimationTarget();