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

Commit 25fe1d06 authored Apr 14, 2023 by Riddle Hsu Committed by Automerger Merge Worker Apr 14, 2023

Merge "Ignore tap ouside for transient-hide task" into udc-dev am: af3ba546

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

Change-Id: Ice850dfc6ceb9aa414bd61f818ae0a9f2087ccf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 5e8ba9b6 af3ba546

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -540,7 +540,12 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
	mergeActivityOnly(info, t);		mergeActivityOnly(info, t);
	} else if (!didMergeThings) {		} else if (!didMergeThings) {
	// Didn't recognize anything in incoming transition so don't merge it.		// Didn't recognize anything in incoming transition so don't merge it.
	Slog.w(TAG, "Don't know how to merge this transition.");		Slog.w(TAG, "Don't know how to merge this transition, foundRecentsClosing="
			+ foundRecentsClosing);
			if (foundRecentsClosing) {
			mWillFinishToHome = false;
			cancel(false /* toHome */);
			}
	return;		return;
	}		}
	// At this point, we are accepting the merge.		// At this point, we are accepting the merge.

services/core/java/com/android/server/wm/WindowManagerService.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8526,6 +8526,14 @@ public class WindowManagerService extends IWindowManager.Stub
	// while in overview		// while in overview
	return;		return;
	}		}
			final WindowState w = t.getWindowState();
			if (w != null) {
			final Task task = w.getTask();
			if (task != null && w.mTransitionController.isTransientHide(task)) {
			// Don't disturb transient animation by accident touch.
			return;
			}
			}

	ProtoLog.i(WM_DEBUG_FOCUS_LIGHT, "onPointerDownOutsideFocusLocked called on %s",		ProtoLog.i(WM_DEBUG_FOCUS_LIGHT, "onPointerDownOutsideFocusLocked called on %s",
	t);		t);