Merge "Hide IME adjust dims when exiting split mode" (5edccfc9) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/DividerView.java

+8 −11

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

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

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

		void exitSplitMode() {
		// Reset tile bounds
		// The view is going to be removed right after this function involved, updates the surface
		// in the current thread instead of posting it to the view's UI thread.
		final SurfaceControl sc = getWindowSurfaceControl();
		if (sc == null) {
		return;
		}
		Transaction t = mTiles.getTransaction();
		t.hide(sc).apply();
		t.hide(sc);
		mImeController.setDimsHidden(t, true);
		t.apply();
		mTiles.releaseTransaction(t);

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