Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dispatch KEYCODE_BACK to the full input pipeline in compat callback." into tm-dev am: d47a172963

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17411191

Change-Id: I2ded56017a6556362b91ec660b8c19186755d1ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shan Huang
2022-04-06 17:44:08 +00:00
committed by Automerger Merge Worker
parent a594d4ca8f d47a172963
commit 2830b6c681
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/java/android/view/ViewRootImpl.java
View File

@@ -6407,6 +6407,24 @@ public final class ViewRootImpl implements ViewParent,
return FINISH_HANDLED;
}
// If the new back dispatch is enabled, intercept KEYCODE_BACK before it reaches the
// view tree and invoke the appropriate {@link OnBackInvokedCallback}.
if (isBack(event)
&& mContext != null
&& WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) {
OnBackInvokedCallback topCallback =
getOnBackInvokedDispatcher().getTopCallback();
if (event.getAction() == KeyEvent.ACTION_UP) {
if (topCallback != null) {
topCallback.onBackInvoked();
return FINISH_HANDLED;
}
} else {
// Drop other actions such as {@link KeyEvent.ACTION_DOWN}.
return FINISH_NOT_HANDLED;
}
}
// Deliver the key to the view hierarchy.
if (mView.dispatchKeyEvent(event)) {
return FINISH_HANDLED;
@@ -6416,19 +6434,6 @@ public final class ViewRootImpl implements ViewParent,
return FINISH_NOT_HANDLED;
}
if (isBack(event)
&& mContext != null
&& WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) {
// Invoke the appropriate {@link OnBackInvokedCallback} if the new back
// navigation should be used, and the key event is not handled by anything else.
OnBackInvokedCallback topCallback =
getOnBackInvokedDispatcher().getTopCallback();
if (topCallback != null) {
topCallback.onBackInvoked();
return FINISH_HANDLED;
}
}
// This dispatch is for windows that don't have a Window.Callback. Otherwise,
// the Window.Callback usually will have already called this (see
// DecorView.superDispatchKeyEvent) leaving this call a no-op.
@@ -10766,11 +10771,7 @@ public final class ViewRootImpl implements ViewParent,
KeyCharacterMap.VIRTUAL_KEYBOARD, 0 /* scancode */,
KeyEvent.FLAG_FROM_SYSTEM | KeyEvent.FLAG_VIRTUAL_HARD_KEY,
InputDevice.SOURCE_KEYBOARD);
ev.setDisplayId(mContext.getDisplay().getDisplayId());
if (mView != null) {
mView.dispatchKeyEvent(ev);
}
enqueueInputEvent(ev);
}
private void registerCompatOnBackInvokedCallback() {