Merge "Make sure to hide IME adjust dims when exiting split mode" into rvc-qpr-dev (8fab4c92) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+6 −11

Original line number	Original line	Diff line number	Diff line
	@@ -845,15 +845,7 @@ public class DividerView extends FrameLayout implements OnTouchListener,
	}		}

	void enterSplitMode(boolean isHomeStackResizable) {		void enterSplitMode(boolean isHomeStackResizable) {
	post(() -> {		setHidden(false);
	final SurfaceControl sc = getWindowSurfaceControl();
	if (sc == null) {
	return;
	}
	Transaction t = mTiles.getTransaction();
	t.show(sc).apply();
	mTiles.releaseTransaction(t);
	});

	SnapTarget miniMid =		SnapTarget miniMid =
	mSplitLayout.getMinimizedSnapAlgorithm(isHomeStackResizable).getMiddleTarget();		mSplitLayout.getMinimizedSnapAlgorithm(isHomeStackResizable).getMiddleTarget();
	@@ -880,14 +872,17 @@ public class DividerView extends FrameLayout implements OnTouchListener,
	}		}

	void exitSplitMode() {		void exitSplitMode() {
	// Reset tile bounds
	final SurfaceControl sc = getWindowSurfaceControl();		final SurfaceControl sc = getWindowSurfaceControl();
	if (sc == null) {		if (sc == null) {
	return;		return;
	}		}
	Transaction t = mTiles.getTransaction();		Transaction t = mTiles.getTransaction();
	t.hide(sc).apply();		t.hide(sc);
			mImeController.setDimsHidden(t, true);
			t.apply();
	mTiles.releaseTransaction(t);		mTiles.releaseTransaction(t);

			// Reset tile bounds
	int midPos = mSplitLayout.getSnapAlgorithm().getMiddleTarget().position;		int midPos = mSplitLayout.getSnapAlgorithm().getMiddleTarget().position;
	mWindowManagerProxy.applyResizeSplits(midPos, mSplitLayout);		mWindowManagerProxy.applyResizeSplits(midPos, mSplitLayout);
	}		}