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

Commit 61b0f8fa authored by Fengjiang Li's avatar Fengjiang Li Committed by Android (Google) Code Review
Browse files

Merge "Make sure OnBackAnimationCallback#onBackStarted is called before... 

Merge "Make sure OnBackAnimationCallback#onBackStarted is called before OnBackAnimationCallback#onBackProgressed" into main
parents da183ef7 a079a274

core/java/android/window/WindowOnBackInvokedDispatcher.java

+2 −2
Original line number Diff line number Diff line
@@ -371,11 +371,11 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher { 
                }

                final OnBackAnimationCallback callback = getBackAnimationCallback();

                if (callback != null) {

                    mProgressAnimator.onBackStarted(backEvent, event ->

                            callback.onBackProgressed(event));

                    callback.onBackStarted(new BackEvent(

                            backEvent.getTouchX(), backEvent.getTouchY(),

                            backEvent.getProgress(), backEvent.getSwipeEdge()));

                    mProgressAnimator.onBackStarted(backEvent, event ->

                            callback.onBackProgressed(event));

                }

            });

        }