Merge "New tap on PiP window behavior" into sc-dev (34b2197e) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/res/layout/pip_menu.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,8 +36,8 @@
		android:layout_height="match_parent">
		<ImageButton
		android:id="@+id/expand_button"
		android:layout_width="60dp"
		android:layout_height="60dp"
		android:layout_width="@dimen/pip_expand_action_size"
		android:layout_height="@dimen/pip_expand_action_size"
		android:layout_gravity="center"
		android:contentDescription="@string/pip_phone_expand"
		android:padding="10dp"

libs/WindowManager/Shell/res/values/dimen.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,9 @@
		<!-- The height of the PiP actions container in which the actions are vertically centered. -->
		<dimen name="pip_action_size">48dp</dimen>

		<!-- The width and height of the PiP expand action. -->
		<dimen name="pip_expand_action_size">60dp</dimen>

		<!-- The padding between actions in the PiP in landscape Note that the PiP does not reflect
		the configuration of the device, so we can't use -land resources. -->
		<dimen name="pip_between_action_padding_land">8dp</dimen>

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import android.os.Handler;
		import android.os.IBinder;
		import android.os.RemoteException;
		import android.util.Log;
		import android.util.Size;
		import android.view.MotionEvent;
		import android.view.SurfaceControl;
		import android.view.SyncRtSurfaceTransactionApplier;
		@@ -210,6 +211,11 @@ public class PhonePipMenuController implements PipMenuController {
		}
		}

		@Nullable
		Size getEstimatedMenuSize() {
		return mPipMenuView == null ? null : mPipMenuView.getEstimatedMenuSize();
		}

		/**
		* When other components requests the menu controller directly to show the menu, we must
		* first fire off the request to the other listeners who will then propagate the call
		@@ -224,13 +230,13 @@ public class PhonePipMenuController implements PipMenuController {
		* Similar to {@link #showMenu(int, Rect, boolean, boolean, boolean)} but only show the menu
		* upon PiP window transition is finished.
		*/
		public void showMenuWithDelay(int menuState, Rect stackBounds, boolean allowMenuTimeout,
		public void showMenuWithPossibleDelay(int menuState, Rect stackBounds, boolean allowMenuTimeout,
		boolean willResizeMenu, boolean showResizeHandle) {
		// hide all visible controls including close button and etc. first, this is to ensure
		// menu is totally invisible during the transition to eliminate unpleasant artifacts
		fadeOutMenu();
		showMenuInternal(menuState, stackBounds, allowMenuTimeout, willResizeMenu,
		true /* withDelay */, showResizeHandle);
		willResizeMenu /* withDelay=willResizeMenu here */, showResizeHandle);
		}

		/**

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

+14 −5

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ import android.os.Handler;
		import android.os.UserHandle;
		import android.util.Log;
		import android.util.Pair;
		import android.util.Size;
		import android.view.KeyEvent;
		import android.view.LayoutInflater;
		import android.view.MotionEvent;
		@@ -76,9 +77,6 @@ public class PipMenuView extends FrameLayout {

		private static final String TAG = "PipMenuView";

		private static final int MESSAGE_INVALID_TYPE = -1;
		public static final int MESSAGE_MENU_EXPANDED = 8;

		private static final int INITIAL_DISMISS_DELAY = 3500;
		private static final int POST_INTERACTION_DISMISS_DELAY = 2000;
		private static final long MENU_FADE_DURATION = 125;
		@@ -86,8 +84,6 @@ public class PipMenuView extends FrameLayout {
		private static final long MENU_SHOW_ON_EXPAND_START_DELAY = 30;

		private static final float MENU_BACKGROUND_ALPHA = 0.3f;
		private static final float DISMISS_BACKGROUND_ALPHA = 0.6f;

		private static final float DISABLED_ACTION_ALPHA = 0.54f;

		private static final boolean ENABLE_RESIZE_HANDLE = false;
		@@ -370,6 +366,19 @@ public class PipMenuView extends FrameLayout {
		}
		}

		/**
		* @return estimated {@link Size} for which the width is based on number of actions and
		* height based on the height of expand button + top and bottom action bar.
		*/
		Size getEstimatedMenuSize() {
		final int pipActionSize = mContext.getResources().getDimensionPixelSize(
		R.dimen.pip_action_size);
		final int width = mActions.size() * pipActionSize;
		final int height = pipActionSize * 2 + mContext.getResources().getDimensionPixelSize(
		R.dimen.pip_expand_action_size);
		return new Size(width, height);
		}

		void setActions(Rect stackBounds, List<RemoteAction> actions) {
		mActions.clear();
		mActions.addAll(actions);

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

+12 −6

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.graphics.PointF;
		import android.graphics.Rect;
		import android.os.Handler;
		import android.provider.DeviceConfig;
		import android.util.Log;
		import android.util.Size;
		import android.view.InputEvent;
		import android.view.MotionEvent;
		@@ -175,7 +176,7 @@ public class PipTouchHandler {
		mPipDismissTargetHandler = new PipDismissTargetHandler(context, pipUiEventLogger,
		mMotionHelper, mainExecutor);
		mTouchState = new PipTouchState(ViewConfiguration.get(context),
		() -> mMenuController.showMenuWithDelay(MENU_STATE_FULL,
		() -> mMenuController.showMenuWithPossibleDelay(MENU_STATE_FULL,
		mPipBoundsState.getBounds(), true /* allowMenuTimeout */, willResizeMenu(),
		shouldShowResizeHandle()),
		menuController::hideMenu,
		@@ -924,16 +925,21 @@ public class PipTouchHandler {
		}

		/**
		* @return whether the menu will resize as a part of showing the full menu.
		* @return {@code true} if the menu should be resized on tap because app explicitly specifies
		* PiP window size that is too small to hold all the actions.
		*/
		private boolean willResizeMenu() {
		if (!mEnableResize) {
		return false;
		}
		return mPipBoundsState.getExpandedBounds().width()
		!= mPipBoundsState.getNormalBounds().width()
		\|\| mPipBoundsState.getExpandedBounds().height()
		!= mPipBoundsState.getNormalBounds().height();
		final Size estimatedMenuSize = mMenuController.getEstimatedMenuSize();
		if (estimatedMenuSize == null) {
		Log.wtf(TAG, "Failed to get estimated menu size");
		return false;
		}
		final Rect currentBounds = mPipBoundsState.getBounds();
		return currentBounds.width() < estimatedMenuSize.getWidth()
		\|\| currentBounds.height() < estimatedMenuSize.getHeight();
		}

		/**