Merge "Remove DisplayContent#positionDisplayAt()" (126ddc91) · Commits · e / os / android_frameworks_base

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -2544,10 +2544,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		return mDisplayAreaPolicy.getDefaultTaskDisplayArea();
		}

		void positionDisplayAt(int position, boolean includingParents) {
		getParent().positionChildAt(position, this, includingParents);
		}

		/**
		* Returns true if the input point is within an app window.
		*/

+3 −3

Original line number	Diff line number	Diff line
		@@ -2931,8 +2931,8 @@ public class WindowManagerService extends IWindowManager.Stub
		synchronized (mGlobalLock) {
		final DisplayContent displayContent = mRoot.getDisplayContent(displayId);
		if (displayContent != null && mRoot.getTopChild() != displayContent) {
		displayContent.positionDisplayAt(WindowContainer.POSITION_TOP,
		true /* includingParents */);
		displayContent.getParent().positionChildAt(WindowContainer.POSITION_TOP,
		displayContent, true /* includingParents */);
		}
		}
		syncInputTransactions();
		@@ -8017,7 +8017,7 @@ public class WindowManagerService extends IWindowManager.Stub

		final DisplayContent displayContent = touchedWindow.getDisplayContent();
		if (!displayContent.isOnTop()) {
		displayContent.positionDisplayAt(WindowContainer.POSITION_TOP,
		displayContent.getParent().positionChildAt(WindowContainer.POSITION_TOP, displayContent,
		true /* includingParents */);
		}
		handleTaskFocusChange(touchedWindow.getTask());