Merge "Let app control insets during exiting PIP animation" into main (167f08cf) · Commits · e / os / android_frameworks_base

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -1316,6 +1316,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		if (mLaunchIntoPipHostActivity != null) {
		pw.println(prefix + "launchIntoPipHostActivity=" + mLaunchIntoPipHostActivity);
		}
		if (mWaitForEnteringPinnedMode) {
		pw.print(prefix); pw.println("mWaitForEnteringPinnedMode=true");
		}

		mLetterboxUiController.dump(pw, prefix);

		@@ -3132,9 +3135,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}

		boolean canReceiveKeys() {
		// TODO(156521483): Propagate the state down the hierarchy instead of checking the parent
		return getWindowConfiguration().canReceiveKeys()
		&& (task == null \|\| task.getWindowConfiguration().canReceiveKeys());
		return getWindowConfiguration().canReceiveKeys() && !mWaitForEnteringPinnedMode;
		}

		boolean isResizeable() {

+4 −0

Original line number	Diff line number	Diff line
		@@ -2211,6 +2211,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		mService.mTaskFragmentOrganizerController.dispatchPendingInfoChangedEvent(
		organizedTf);
		}

		if (taskDisplayArea.getFocusedRootTask() == rootTask) {
		taskDisplayArea.clearPreferredTopFocusableRootTask();
		}
		} finally {
		mService.continueWindowLayout();
		try {