Merge "PiP: Move resetting mAllowTouches into scope of MenuView" into sc-dev (debdf699) · Commits · e / os / android_frameworks_base

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -173,13 +173,6 @@ public class PhonePipMenuController implements PipMenuController {
		detachPipMenuView();
		}


		void onPinnedStackAnimationEnded() {
		if (isMenuVisible()) {
		mPipMenuView.onPipAnimationEnded();
		}
		}

		private void attachPipMenuView() {
		// In case detach was not called (e.g. PIP unexpectedly closed)
		if (mPipMenuView != null) {

+0 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ import android.content.res.Configuration;
		import android.graphics.Rect;
		import android.os.IBinder;
		import android.os.RemoteException;
		import android.os.SystemProperties;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.util.Log;
		@@ -606,7 +605,6 @@ public class PipController implements PipTransitionController.PipTransitionCallb
		// Re-enable touches after the animation completes
		mTouchHandler.setTouchEnabled(true);
		mTouchHandler.onPinnedStackAnimationEnded(direction);
		mMenuController.onPinnedStackAnimationEnded();
		}

		private void updateMovementBounds(@Nullable Rect toBounds, boolean fromRotation,

+6 −5

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ import android.content.Context;
		import android.content.Intent;
		import android.graphics.Color;
		import android.graphics.Rect;
		import android.graphics.drawable.ColorDrawable;
		import android.graphics.drawable.Drawable;
		import android.net.Uri;
		import android.os.Bundle;
		@@ -279,11 +278,17 @@ public class PipMenuView extends FrameLayout {
		mMenuContainerAnimator.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		mAllowTouches = true;
		notifyMenuStateChangeFinish(menuState);
		if (allowMenuTimeout) {
		repostDelayedHide(INITIAL_DISMISS_DELAY);
		}
		}

		@Override
		public void onAnimationCancel(Animator animation) {
		mAllowTouches = true;
		}
		});
		if (withDelay) {
		// starts the menu container animation after window expansion is completed
		@@ -326,10 +331,6 @@ public class PipMenuView extends FrameLayout {
		cancelDelayedHide();
		}

		void onPipAnimationEnded() {
		mAllowTouches = true;
		}

		void updateMenuLayout(Rect bounds) {
		mPipMenuIconsAlgorithm.onBoundsChanged(bounds);
		}