Merge "Skip moving PiP for IME/shelf change if user is dragging." into tm-qpr-dev (d04f92f2) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -427,7 +427,7 @@ public class PipTouchHandler {
	// If this is from an IME or shelf adjustment, then we should move the PiP so that it is not		// If this is from an IME or shelf adjustment, then we should move the PiP so that it is not
	// occluded by the IME or shelf.		// occluded by the IME or shelf.
	if (fromImeAdjustment \|\| fromShelfAdjustment) {		if (fromImeAdjustment \|\| fromShelfAdjustment) {
	if (mTouchState.isUserInteracting()) {		if (mTouchState.isUserInteracting() && mTouchState.isDragging()) {
	// Defer the update of the current movement bounds until after the user finishes		// Defer the update of the current movement bounds until after the user finishes
	// touching the screen		// touching the screen
	} else if (ENABLE_PIP_KEEP_CLEAR_ALGORITHM) {		} else if (ENABLE_PIP_KEEP_CLEAR_ALGORITHM) {