Merge "Persist the launcher keep clear area." into tm-qpr-dev (edf1ca06) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -103,7 +103,6 @@ import com.android.wm.shell.sysui.UserChangeListener;
		import com.android.wm.shell.transition.Transitions;

		import java.io.PrintWriter;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Objects;
		import java.util.Optional;
		@@ -118,6 +117,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb
		UserChangeListener {
		private static final String TAG = "PipController";

		private static final String LAUNCHER_KEEP_CLEAR_AREA_TAG = "hotseat";

		private static final long PIP_KEEP_CLEAR_AREAS_DELAY =
		SystemProperties.getLong("persist.wm.debug.pip_keep_clear_areas_delay", 200);

		@@ -929,12 +930,10 @@ public class PipController implements PipTransitionController.PipTransitionCallb
		0, mPipBoundsState.getDisplayBounds().bottom - height,
		mPipBoundsState.getDisplayBounds().right,
		mPipBoundsState.getDisplayBounds().bottom);
		Set<Rect> restrictedKeepClearAreas = new HashSet<>(
		mPipBoundsState.getRestrictedKeepClearAreas());
		restrictedKeepClearAreas.add(rect);
		mPipBoundsState.setKeepClearAreas(restrictedKeepClearAreas,
		mPipBoundsState.getUnrestrictedKeepClearAreas());
		mPipBoundsState.addNamedUnrestrictedKeepClearArea(LAUNCHER_KEEP_CLEAR_AREA_TAG, rect);
		updatePipPositionForKeepClearAreas();
		} else {
		mPipBoundsState.removeNamedUnrestrictedKeepClearArea(LAUNCHER_KEEP_CLEAR_AREA_TAG);
		}
		}