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

Merge "Fix back gesture send to wrong focus window" into tm-dev

Browse Source
This commit is contained in:
Arthur Hung
2022-05-06 11:12:19 +00:00
committed by Android (Google) Code Review
parent b6de832709 7d870f9ec2
commit 4bf81d5758
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
View File

@@ -246,9 +246,13 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
* {@link BackAnimationController} * {@link BackAnimationController}
*/ */
public void onMotionEvent(MotionEvent event, int action, @BackEvent.SwipeEdge int swipeEdge) { public void onMotionEvent(MotionEvent event, int action, @BackEvent.SwipeEdge int swipeEdge) {
if (action == MotionEvent.ACTION_DOWN) { if (action == MotionEvent.ACTION_MOVE) {
if (!mBackGestureStarted) {
// Let the animation initialized here to make sure the onPointerDownOutsideFocus
// could be happened when ACTION_DOWN, it may change the current focus that we
// would access it when startBackNavigation.
initAnimation(event); initAnimation(event);
} else if (action == MotionEvent.ACTION_MOVE) { }
onMove(event, swipeEdge); onMove(event, swipeEdge);
} else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { } else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
ProtoLog.d(WM_SHELL_BACK_PREVIEW, ProtoLog.d(WM_SHELL_BACK_PREVIEW,

5
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java
View File

@@ -209,12 +209,11 @@ public class BackAnimationControllerTest {
createNavigationInfo(animationTarget, null, null, createNavigationInfo(animationTarget, null, null,
BackNavigationInfo.TYPE_RETURN_TO_HOME, null); BackNavigationInfo.TYPE_RETURN_TO_HOME, null);
// Check that back start is dispatched.
doMotionEvent(MotionEvent.ACTION_DOWN, 0); doMotionEvent(MotionEvent.ACTION_DOWN, 0);
verify(mIOnBackInvokedCallback).onBackStarted();
// Check that back progress is dispatched. // Check that back start and progress is dispatched when first move.
doMotionEvent(MotionEvent.ACTION_MOVE, 100); doMotionEvent(MotionEvent.ACTION_MOVE, 100);
verify(mIOnBackInvokedCallback).onBackStarted();
ArgumentCaptor<BackEvent> backEventCaptor = ArgumentCaptor.forClass(BackEvent.class); ArgumentCaptor<BackEvent> backEventCaptor = ArgumentCaptor.forClass(BackEvent.class);
verify(mIOnBackInvokedCallback).onBackProgressed(backEventCaptor.capture()); verify(mIOnBackInvokedCallback).onBackProgressed(backEventCaptor.capture());
assertEquals(animationTarget, backEventCaptor.getValue().getDepartingAnimationTarget()); assertEquals(animationTarget, backEventCaptor.getValue().getDepartingAnimationTarget());

9
services/core/java/com/android/server/wm/BackNavigationController.java
View File

@@ -124,8 +124,7 @@ class BackNavigationController {
LocalServices.getService(WindowManagerInternal.class); LocalServices.getService(WindowManagerInternal.class);
IBinder focusedWindowToken = windowManagerInternal.getFocusedWindowToken(); IBinder focusedWindowToken = windowManagerInternal.getFocusedWindowToken();
window = wmService.windowForClientLocked(null, focusedWindowToken, window = wmService.getFocusedWindowLocked();
false /* throwOnError */);
if (window == null) { if (window == null) {
EmbeddedWindowController.EmbeddedWindow embeddedWindow = EmbeddedWindowController.EmbeddedWindow embeddedWindow =
@@ -146,12 +145,6 @@ class BackNavigationController {
"Focused window found using getFocusedWindowToken"); "Focused window found using getFocusedWindowToken");
} }
if (window == null) {
window = wmService.getFocusedWindowLocked();
ProtoLog.d(WM_DEBUG_BACK_PREVIEW,
"Focused window found using wmService.getFocusedWindowLocked()");
}
if (window == null) { if (window == null) {
// We don't have any focused window, fallback ont the top currentTask of the focused // We don't have any focused window, fallback ont the top currentTask of the focused
// display. // display.

1
services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java
View File

@@ -306,6 +306,7 @@ public class BackNavigationControllerTests extends WindowTestsBase {
if (focus) { if (focus) {
doReturn(window.getWindowInfo().token) doReturn(window.getWindowInfo().token)
.when(mWindowManagerInternal).getFocusedWindowToken(); .when(mWindowManagerInternal).getFocusedWindowToken();
doReturn(window).when(mWm).getFocusedWindowLocked();
} }
} }
} }