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

Commit e9c44686 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Disable velocity-slowdown when timestamp API is enabled" into main

parents 32eaeac4 f6d48701

core/java/android/window/WindowOnBackInvokedDispatcher.java

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.window;



import static com.android.window.flags.Flags.predictiveBackPrioritySystemNavigationObserver;

import static com.android.window.flags.Flags.predictiveBackTimestampApi;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -563,7 +564,8 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher { 
                }

                OnBackAnimationCallback animationCallback = getBackAnimationCallback();

                if (animationCallback != null

                        && !(callback instanceof ImeBackAnimationController)) {

                        && !(callback instanceof ImeBackAnimationController)

                        && !predictiveBackTimestampApi()) {

                    mProgressAnimator.onBackInvoked(() -> {

                        if (mIsSystemCallback) {

                            mSystemNavigationObserverCallbackRunnable.run();