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

Commit 665e821c authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Fix onUserInteraction not called with 3-button-nav and enableOnBackInvokedCallback=true 

Bug: 346943119
Flag: com.android.window.flags.predictive_back_system_anims
Test: atest BackNavigationTests
Test: atest OnBackInvokedCallbackGestureTest
Test: Manual, i.e. verifying in a test app that onUserInteraction is called when pressing back key in 3-button-nav and when enableOnBackInvokedCallback=true
Change-Id: Idb715d72255d8670dceed73041a37791c0e8c34c
parent c4b9427f

core/java/android/view/ViewRootImpl.java

+5 −4
Original line number Diff line number Diff line
@@ -7511,7 +7511,6 @@ public final class ViewRootImpl implements ViewParent, 
                            animationCallback.onBackCancelled();

                        } else {

                            topCallback.onBackInvoked();

                            return FINISH_HANDLED;

                        }

                        break;

                }
@@ -7519,14 +7518,16 @@ public final class ViewRootImpl implements ViewParent, 
                if (keyEvent.getAction() == KeyEvent.ACTION_UP) {

                    if (!keyEvent.isCanceled()) {

                        topCallback.onBackInvoked();

                        return FINISH_HANDLED;

                    } else {

                        Log.d(mTag, "Skip onBackInvoked(), reason: keyEvent.isCanceled=true");

                    }

                }

            }













            return FINISH_NOT_HANDLED;













            if (keyEvent.getAction() == KeyEvent.ACTION_UP) {













                // forward a cancelled event so that following stages cancel their back logic













                keyEvent.cancel();













            }













            return FORWARD;















        }





























        @Override