Merge "Makes PIP buttons <Button> / <ImageButton>" (c7d68ad2) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/pip_menu_action.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@
	See the License for the specific language governing permissions and		See the License for the specific language governing permissions and
	limitations under the License.		limitations under the License.
	-->		-->
	<ImageView		<ImageButton
	xmlns:android="http://schemas.android.com/apk/res/android"		xmlns:android="http://schemas.android.com/apk/res/android"
	android:layout_width="@dimen/pip_action_size"		android:layout_width="@dimen/pip_action_size"
	android:layout_height="@dimen/pip_action_size"		android:layout_height="@dimen/pip_action_size"

packages/SystemUI/res/layout/pip_menu_activity.xml

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@
	android:id="@+id/expand_container"		android:id="@+id/expand_container"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="match_parent">		android:layout_height="match_parent">
	<ImageView		<ImageButton
	android:id="@+id/expand_button"		android:id="@+id/expand_button"
	android:layout_width="60dp"		android:layout_width="60dp"
	android:layout_height="60dp"		android:layout_height="60dp"
	@@ -60,7 +60,7 @@
	</FrameLayout>		</FrameLayout>
	</FrameLayout>		</FrameLayout>

	<ImageView		<ImageButton
	android:id="@+id/settings"		android:id="@+id/settings"
	android:layout_width="@dimen/pip_action_size"		android:layout_width="@dimen/pip_action_size"
	android:layout_height="@dimen/pip_action_size"		android:layout_height="@dimen/pip_action_size"
	@@ -70,7 +70,7 @@
	android:src="@drawable/ic_settings"		android:src="@drawable/ic_settings"
	android:background="?android:selectableItemBackgroundBorderless" />		android:background="?android:selectableItemBackgroundBorderless" />

	<ImageView		<ImageButton
	android:id="@+id/dismiss"		android:id="@+id/dismiss"
	android:layout_width="@dimen/pip_action_size"		android:layout_width="@dimen/pip_action_size"
	android:layout_height="@dimen/pip_action_size"		android:layout_height="@dimen/pip_action_size"

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

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -69,7 +69,7 @@ import android.view.ViewGroup;
	import android.view.WindowManager.LayoutParams;		import android.view.WindowManager.LayoutParams;
	import android.view.accessibility.AccessibilityManager;		import android.view.accessibility.AccessibilityManager;
	import android.widget.FrameLayout;		import android.widget.FrameLayout;
	import android.widget.ImageView;		import android.widget.ImageButton;
	import android.widget.LinearLayout;		import android.widget.LinearLayout;

	import com.android.systemui.Interpolators;		import com.android.systemui.Interpolators;
	@@ -115,7 +115,6 @@ public class PipMenuActivity extends Activity {
	private LinearLayout mActionsGroup;		private LinearLayout mActionsGroup;
	private View mSettingsButton;		private View mSettingsButton;
	private View mDismissButton;		private View mDismissButton;
	private ImageView mExpandButton;
	private int mBetweenActionPaddingLand;		private int mBetweenActionPaddingLand;

	private AnimatorSet mMenuContainerAnimator;		private AnimatorSet mMenuContainerAnimator;
	@@ -246,7 +245,6 @@ public class PipMenuActivity extends Activity {
	mActionsGroup = findViewById(R.id.actions_group);		mActionsGroup = findViewById(R.id.actions_group);
	mBetweenActionPaddingLand = getResources().getDimensionPixelSize(		mBetweenActionPaddingLand = getResources().getDimensionPixelSize(
	R.dimen.pip_between_action_padding_land);		R.dimen.pip_between_action_padding_land);
	mExpandButton = findViewById(R.id.expand_button);

	updateFromIntent(getIntent());		updateFromIntent(getIntent());
	setTitle(R.string.pip_menu_title);		setTitle(R.string.pip_menu_title);
	@@ -482,7 +480,7 @@ public class PipMenuActivity extends Activity {
	// Ensure we have as many buttons as actions		// Ensure we have as many buttons as actions
	final LayoutInflater inflater = LayoutInflater.from(this);		final LayoutInflater inflater = LayoutInflater.from(this);
	while (mActionsGroup.getChildCount() < mActions.size()) {		while (mActionsGroup.getChildCount() < mActions.size()) {
	final ImageView actionView = (ImageView) inflater.inflate(		final ImageButton actionView = (ImageButton) inflater.inflate(
	R.layout.pip_menu_action, mActionsGroup, false);		R.layout.pip_menu_action, mActionsGroup, false);
	mActionsGroup.addView(actionView);		mActionsGroup.addView(actionView);
	}		}
	@@ -499,7 +497,7 @@ public class PipMenuActivity extends Activity {
	(stackBounds.width() > stackBounds.height());		(stackBounds.width() > stackBounds.height());
	for (int i = 0; i < mActions.size(); i++) {		for (int i = 0; i < mActions.size(); i++) {
	final RemoteAction action = mActions.get(i);		final RemoteAction action = mActions.get(i);
	final ImageView actionView = (ImageView) mActionsGroup.getChildAt(i);		final ImageButton actionView = (ImageButton) mActionsGroup.getChildAt(i);

	// TODO: Check if the action drawable has changed before we reload it		// TODO: Check if the action drawable has changed before we reload it
	action.getIcon().loadDrawableAsync(this, d -> {		action.getIcon().loadDrawableAsync(this, d -> {