Merge "[DO NOT MERGE] Handle landscape and portrait display for PIP rotation" (316b537c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ public class PipBoundsHandler {
		private int mImeHeight;
		private boolean mIsShelfShowing;
		private int mShelfHeight;
		private boolean mDefaultLandscape;

		private final DisplayController.OnDisplaysChangedListener mDisplaysChangedListener =
		new DisplayController.OnDisplaysChangedListener() {
		@@ -87,6 +88,7 @@ public class PipBoundsHandler {
		public void onDisplayAdded(int displayId) {
		if (displayId == mContext.getDisplayId()) {
		mDisplayLayout.set(mDisplayController.getDisplayLayout(displayId));
		mDefaultLandscape = (mDisplayInfo.logicalWidth > mDisplayInfo.logicalHeight);
		}
		}
		};
		@@ -362,10 +364,18 @@ public class PipBoundsHandler {
		private void updateDisplayInfoIfNeeded() {
		final boolean updateNeeded;
		if ((mDisplayInfo.rotation == ROTATION_0) \|\| (mDisplayInfo.rotation == ROTATION_180)) {
		if (!mDefaultLandscape) {
		updateNeeded = (mDisplayInfo.logicalWidth > mDisplayInfo.logicalHeight);
		} else {
		updateNeeded = (mDisplayInfo.logicalWidth < mDisplayInfo.logicalHeight);
		}
		} else {
		if (!mDefaultLandscape) {
		updateNeeded = (mDisplayInfo.logicalWidth < mDisplayInfo.logicalHeight);
		} else {
		updateNeeded = (mDisplayInfo.logicalWidth > mDisplayInfo.logicalHeight);
		}
		}
		if (updateNeeded) {
		final int newLogicalHeight = mDisplayInfo.logicalWidth;
		mDisplayInfo.logicalWidth = mDisplayInfo.logicalHeight;