Merge "Don't update the PiP bounds when we aren't resizing the PiP" (c436cea8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -514,7 +514,7 @@ public class PipTouchHandler {
		* Sets the menu visibility.
		*/
		private void setMenuState(int menuState, boolean resize) {
		if (menuState == MENU_STATE_FULL) {
		if (menuState == MENU_STATE_FULL && mMenuState != MENU_STATE_FULL) {
		// Save the current snap fraction and if we do not drag or move the PiP, then
		// we store back to this snap fraction. Otherwise, we'll reset the snap
		// fraction and snap to the closest edge
		@@ -523,7 +523,7 @@ public class PipTouchHandler {
		mSavedSnapFraction = mMotionHelper.animateToExpandedState(expandedBounds,
		mMovementBounds, mExpandedMovementBounds);
		}
		} else if (menuState == MENU_STATE_NONE) {
		} else if (menuState == MENU_STATE_NONE && mMenuState == MENU_STATE_FULL) {
		// Try and restore the PiP to the closest edge, using the saved snap fraction
		// if possible
		if (resize) {