Merge "Add ability to change PiP menu icon locations on the fly." (36b0f9d4) · Commits · e / os / android_frameworks_base

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

+24 −18

Original line number	Diff line number	Diff line
		@@ -62,11 +62,16 @@
		</FrameLayout>
		</FrameLayout>

		<LinearLayout
		android:id="@+id/top_end_container"
		android:layout_gravity="top\|end"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal">
		<ImageButton
		android:id="@+id/settings"
		android:layout_width="@dimen/pip_action_size"
		android:layout_height="@dimen/pip_action_size"
		android:layout_gravity="top\|start"
		android:padding="@dimen/pip_action_padding"
		android:contentDescription="@string/pip_phone_settings"
		android:src="@drawable/pip_ic_settings"
		@@ -76,11 +81,11 @@
		android:id="@+id/dismiss"
		android:layout_width="@dimen/pip_action_size"
		android:layout_height="@dimen/pip_action_size"
		android:layout_gravity="top\|end"
		android:padding="@dimen/pip_action_padding"
		android:contentDescription="@string/pip_phone_close"
		android:src="@drawable/pip_ic_close_white"
		android:background="?android:selectableItemBackgroundBorderless" />
		</LinearLayout>

		<!--TODO (b/156917828): Add content description for a11y purposes?-->
		<ImageButton
		@@ -89,6 +94,7 @@
		android:layout_height="@dimen/pip_resize_handle_size"
		android:layout_gravity="top\|start"
		android:layout_margin="@dimen/pip_resize_handle_margin"
		android:padding="@dimen/pip_resize_handle_padding"
		android:src="@drawable/pip_resize_handle"
		android:background="?android:selectableItemBackgroundBorderless" />
		</FrameLayout>

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,8 @@
		<!-- The touchable/draggable edge size for PIP resize. -->
		<dimen name="pip_resize_edge_size">48dp</dimen>

		<!-- PIP Resize handle size and margin. -->
		<!-- PIP Resize handle size, margin and padding. -->
		<dimen name="pip_resize_handle_size">12dp</dimen>
		<dimen name="pip_resize_handle_margin">4dp</dimen>
		<dimen name="pip_resize_handle_padding">0dp</dimen>
		</resources>

packages/SystemUI/src/com/android/systemui/dagger/SystemUIRootComponent.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import com.android.systemui.dump.DumpManager;
		import com.android.systemui.fragments.FragmentService;
		import com.android.systemui.keyguard.KeyguardSliceProvider;
		import com.android.systemui.onehanded.dagger.OneHandedModule;
		import com.android.systemui.pip.phone.PipMenuActivity;
		import com.android.systemui.pip.phone.dagger.PipModule;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.util.InjectionInflationController;
		@@ -121,4 +122,9 @@ public interface SystemUIRootComponent {
		* Member injection into the supplied argument.
		*/
		void inject(KeyguardSliceProvider keyguardSliceProvider);

		/**
		* Member injection into the supplied argument.
		*/
		void inject(PipMenuActivity pipMenuActivity);
		}

packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -178,6 +178,9 @@ public class PipTaskOrganizer extends TaskOrganizer implements
		Rect startBounds = (Rect) args.arg2;
		Rect toBounds = (Rect) args.arg3;
		userResizePip(startBounds, toBounds);
		if (updateBoundsCallback != null) {
		updateBoundsCallback.accept(toBounds);
		}
		break;
		}
		}

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -76,12 +76,15 @@ import android.widget.ImageButton;
		import android.widget.LinearLayout;

		import com.android.systemui.Interpolators;
		import com.android.systemui.SystemUIFactory;
		import com.android.wm.shell.R;

		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.List;

		import javax.inject.Inject;

		/**
		* Translucent activity that gets started on top of a task in PIP to allow the user to control it.
		*/
		@@ -100,6 +103,7 @@ public class PipMenuActivity extends Activity {
		public static final int MESSAGE_POINTER_EVENT = 7;
		public static final int MESSAGE_MENU_EXPANDED = 8;
		public static final int MESSAGE_FADE_OUT_MENU = 9;
		public static final int MESSAGE_UPDATE_MENU_LAYOUT = 10;

		private static final int INITIAL_DISMISS_DELAY = 3500;
		private static final int POST_INTERACTION_DISMISS_DELAY = 2000;
		@@ -129,8 +133,12 @@ public class PipMenuActivity extends Activity {
		private View mSettingsButton;
		private View mDismissButton;
		private View mResizeHandle;
		private View mTopEndContainer;
		private int mBetweenActionPaddingLand;

		@Inject
		PipMenuIconsAlgorithm mPipMenuIconsAlgorithm;

		private AnimatorSet mMenuContainerAnimator;

		private ValueAnimator.AnimatorUpdateListener mMenuBgUpdateListener =
		@@ -193,6 +201,11 @@ public class PipMenuActivity extends Activity {
		fadeOutMenu();
		break;
		}
		case MESSAGE_UPDATE_MENU_LAYOUT: {
		final Rect bounds = (Rect) msg.obj;
		mPipMenuIconsAlgorithm.onBoundsChanged(bounds);
		break;
		}
		}
		}
		};
		@@ -208,6 +221,9 @@ public class PipMenuActivity extends Activity {
		getWindow().addFlags(LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH);

		super.onCreate(savedInstanceState);

		SystemUIFactory.getInstance().getRootComponent().inject(this);

		setContentView(R.layout.pip_menu_activity);

		mAccessibilityManager = getSystemService(AccessibilityManager.class);
		@@ -217,6 +233,7 @@ public class PipMenuActivity extends Activity {
		mViewRoot.setBackground(mBackgroundDrawable);
		mMenuContainer = findViewById(R.id.menu_container);
		mMenuContainer.setAlpha(0);
		mTopEndContainer = findViewById(R.id.top_end_container);
		mSettingsButton = findViewById(R.id.settings);
		mSettingsButton.setAlpha(0);
		mSettingsButton.setOnClickListener((v) -> {
		@@ -238,6 +255,8 @@ public class PipMenuActivity extends Activity {
		mBetweenActionPaddingLand = getResources().getDimensionPixelSize(
		R.dimen.pip_between_action_padding_land);

		mPipMenuIconsAlgorithm.bindViews((ViewGroup) mViewRoot, (ViewGroup) mTopEndContainer,
		mResizeHandle, mSettingsButton, mDismissButton);
		updateFromIntent(getIntent());
		setTitle(R.string.pip_menu_title);
		setDisablePreviewScreenshots(true);