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

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

Merge "Fix onUserInteraction not called with 3-button-nav and... 

Merge "Fix onUserInteraction not called with 3-button-nav and enableOnBackInvokedCallback=true" into main
parents efe5dd92 665e821c

core/java/android/view/ViewRootImpl.java

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

                        } else {

                            topCallback.onBackInvoked();

                            return FINISH_HANDLED;

                        }

                        break;

                }
@@ -7538,14 +7537,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