Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a common TvWindowMenuActionButton"

Browse Source
This commit is contained in:
Ivan Makarov
2022-08-15 14:33:13 +00:00
committed by Android (Google) Code Review
parent 3de48c79ed 38aacc4d86
commit 723ce1431b
15 changed files with 125 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
libs/WindowManager/Shell/res/animator/tv_pip_menu_action_button_animator.xml → libs/WindowManager/Shell/res/animator/tv_window_menu_action_button_animator.xml
View File

2
libs/WindowManager/Shell/res/color/tv_pip_menu_close_icon.xml → libs/WindowManager/Shell/res/color/tv_window_menu_close_icon.xml
View File

@@ -15,5 +15,5 @@
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tv_pip_menu_icon_unfocused" />
<item android:color="@color/tv_window_menu_icon_unfocused" />
</selector>

6
libs/WindowManager/Shell/res/color/tv_pip_menu_icon_bg.xml → libs/WindowManager/Shell/res/color/tv_window_menu_close_icon_bg.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2021 The Android Open Source Project
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -16,6 +16,6 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"
android:color="@color/tv_pip_menu_icon_bg_focused" />
<item android:color="@color/tv_pip_menu_icon_bg_unfocused" />
android:color="@color/tv_window_menu_close_icon_bg_focused" />
<item android:color="@color/tv_window_menu_close_icon_bg_unfocused" />
</selector>

8
libs/WindowManager/Shell/res/color/tv_pip_menu_icon.xml → libs/WindowManager/Shell/res/color/tv_window_menu_icon.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2021 The Android Open Source Project
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"
android:color="@color/tv_pip_menu_icon_focused" />
android:color="@color/tv_window_menu_icon_focused" />
<item android:state_enabled="false"
android:color="@color/tv_pip_menu_icon_disabled" />
<item android:color="@color/tv_pip_menu_icon_unfocused" />
android:color="@color/tv_window_menu_icon_disabled" />
<item android:color="@color/tv_window_menu_icon_unfocused" />
</selector>

4
libs/WindowManager/Shell/res/color/tv_pip_menu_close_icon_bg.xml → libs/WindowManager/Shell/res/color/tv_window_menu_icon_bg.xml
View File

@@ -16,6 +16,6 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"
android:color="@color/tv_pip_menu_close_icon_bg_focused" />
<item android:color="@color/tv_pip_menu_close_icon_bg_unfocused" />
android:color="@color/tv_window_menu_icon_bg_focused" />
<item android:color="@color/tv_window_menu_icon_bg_unfocused" />
</selector>

21
libs/WindowManager/Shell/res/drawable/tv_pip_button_bg.xml
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/pip_menu_button_radius" />
<solid android:color="@color/tv_pip_menu_icon_bg" />
</shape>

2
libs/WindowManager/Shell/res/drawable/tv_pip_menu_border.xml
View File

@@ -15,7 +15,7 @@
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android"
android:exitFadeDuration="@integer/pip_menu_fade_animation_duration">
android:exitFadeDuration="@integer/tv_window_menu_fade_animation_duration">
<item android:state_activated="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/pip_menu_border_corner_radius" />

21
libs/WindowManager/Shell/res/drawable/tv_window_button_bg.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/tv_window_menu_button_radius" />
<solid android:color="@color/tv_window_menu_icon_bg" />
</shape>

10
libs/WindowManager/Shell/res/layout/tv_pip_menu.xml
View File

@@ -64,14 +64,14 @@
android:layout_width="@dimen/pip_menu_button_wrapper_margin"
android:layout_height="@dimen/pip_menu_button_wrapper_margin"/>
<com.android.wm.shell.pip.tv.TvPipMenuActionButton
<com.android.wm.shell.common.TvWindowMenuActionButton
android:id="@+id/tv_pip_menu_fullscreen_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/pip_ic_fullscreen_white"
android:text="@string/pip_fullscreen" />
<com.android.wm.shell.pip.tv.TvPipMenuActionButton
<com.android.wm.shell.common.TvWindowMenuActionButton
android:id="@+id/tv_pip_menu_close_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -80,14 +80,14 @@
<!-- More TvPipMenuActionButtons may be added here at runtime. -->
<com.android.wm.shell.pip.tv.TvPipMenuActionButton
<com.android.wm.shell.common.TvWindowMenuActionButton
android:id="@+id/tv_pip_menu_move_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/pip_ic_move_white"
android:text="@string/pip_move" />
<com.android.wm.shell.pip.tv.TvPipMenuActionButton
<com.android.wm.shell.common.TvWindowMenuActionButton
android:id="@+id/tv_pip_menu_expand_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -145,7 +145,7 @@
android:layout_margin="@dimen/pip_menu_outer_space_frame"
android:background="@drawable/tv_pip_menu_border"/>
<com.android.wm.shell.pip.tv.TvPipMenuActionButton
<com.android.wm.shell.common.TvWindowMenuActionButton
android:id="@+id/tv_pip_menu_done_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

40
libs/WindowManager/Shell/res/layout/tv_pip_menu_action_button.xml
View File

@@ -1,40 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Layout for TvPipMenuActionButton -->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/button"
android:layout_width="@dimen/pip_menu_button_size"
android:layout_height="@dimen/pip_menu_button_size"
android:padding="@dimen/pip_menu_button_margin"
android:stateListAnimator="@animator/tv_pip_menu_action_button_animator"
android:focusable="true">
<View android:id="@+id/background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:duplicateParentState="true"
android:background="@drawable/tv_pip_button_bg"/>
<ImageView android:id="@+id/icon"
android:layout_width="@dimen/pip_menu_icon_size"
android:layout_height="@dimen/pip_menu_icon_size"
android:layout_gravity="center"
android:duplicateParentState="true"
android:tint="@color/tv_pip_menu_icon" />
</FrameLayout>

40
libs/WindowManager/Shell/res/layout/tv_window_menu_action_button.xml Normal file
View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<!-- Layout for TvWindowMenuActionButton -->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/button"
android:layout_width="@dimen/tv_window_menu_button_size"
android:layout_height="@dimen/tv_window_menu_button_size"
android:padding="@dimen/tv_window_menu_button_margin"
android:stateListAnimator="@animator/tv_window_menu_action_button_animator"
android:focusable="true">
<View android:id="@+id/background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:duplicateParentState="true"
android:background="@drawable/tv_window_button_bg"/>
<ImageView android:id="@+id/icon"
android:layout_width="@dimen/tv_window_menu_icon_size"
android:layout_height="@dimen/tv_window_menu_icon_size"
android:layout_gravity="center"
android:duplicateParentState="true"
android:tint="@color/tv_window_menu_icon" />
</FrameLayout>

16
libs/WindowManager/Shell/res/values-tvdpi/dimen.xml
View File

@@ -15,20 +15,20 @@
limitations under the License.
-->
<resources>
<!-- The dimensions to user for picture-in-picture action buttons. -->
<dimen name="pip_menu_button_size">48dp</dimen>
<dimen name="pip_menu_button_radius">20dp</dimen>
<dimen name="pip_menu_icon_size">20dp</dimen>
<dimen name="pip_menu_button_margin">4dp</dimen>
<dimen name="pip_menu_button_wrapper_margin">26dp</dimen>
<dimen name="pip_menu_border_width">4dp</dimen>
<integer name="pip_menu_fade_animation_duration">500</integer>
<!-- The dimensions to use for tv window menu action buttons. -->
<dimen name="tv_window_menu_button_size">48dp</dimen>
<dimen name="tv_window_menu_button_radius">20dp</dimen>
<dimen name="tv_window_menu_icon_size">20dp</dimen>
<dimen name="tv_window_menu_button_margin">4dp</dimen>
<integer name="tv_window_menu_fade_animation_duration">500</integer>
<!-- The pip menu front border corner radius is 2dp smaller than
the background corner radius to hide the background from
showing through. -->
<dimen name="pip_menu_border_corner_radius">4dp</dimen>
<dimen name="pip_menu_background_corner_radius">6dp</dimen>
<dimen name="pip_menu_border_width">4dp</dimen>
<dimen name="pip_menu_outer_space">24dp</dimen>
<dimen name="pip_menu_button_wrapper_margin">26dp</dimen>
<!-- outer space minus border width -->
<dimen name="pip_menu_outer_space_frame">20dp</dimen>

16
libs/WindowManager/Shell/res/values/colors_tv.xml
View File

@@ -15,13 +15,15 @@
~ limitations under the License.
-->
<resources>
<color name="tv_pip_menu_icon_focused">#0E0E0F</color>
<color name="tv_pip_menu_icon_unfocused">#F8F9FA</color>
<color name="tv_pip_menu_icon_disabled">#80868B</color>
<color name="tv_pip_menu_close_icon_bg_focused">#D93025</color>
<color name="tv_pip_menu_close_icon_bg_unfocused">#D69F261F</color>
<color name="tv_pip_menu_icon_bg_focused">#E8EAED</color>
<color name="tv_pip_menu_icon_bg_unfocused">#990E0E0F</color>
<color name="tv_window_menu_icon_focused">#0E0E0F</color>
<color name="tv_window_menu_icon_unfocused">#F8F9FA</color>
<color name="tv_window_menu_icon_disabled">#80868B</color>
<color name="tv_window_menu_close_icon_bg_focused">#D93025</color>
<color name="tv_window_menu_close_icon_bg_unfocused">#D69F261F</color>
<color name="tv_window_menu_icon_bg_focused">#E8EAED</color>
<color name="tv_window_menu_icon_bg_unfocused">#990E0E0F</color>
<color name="tv_pip_menu_focus_border">#E8EAED</color>
<color name="tv_pip_menu_background">#1E232C</color>

38
libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuActionButton.java → libs/WindowManager/Shell/src/com/android/wm/shell/common/TvWindowMenuActionButton.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2020 The Android Open Source Project
* Copyright (C) 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.wm.shell.pip.tv;
package com.android.wm.shell.common;
import android.content.Context;
import android.content.res.TypedArray;
@@ -28,33 +28,32 @@ import android.widget.RelativeLayout;
import com.android.wm.shell.R;
/**
* A View that represents Pip Menu action button, such as "Fullscreen" and "Close" as well custom
* (provided by the application in Pip) and media buttons.
* A common action button for TV window menu layouts.
*/
public class TvPipMenuActionButton extends RelativeLayout implements View.OnClickListener {
public class TvWindowMenuActionButton extends RelativeLayout implements View.OnClickListener {
private final ImageView mIconImageView;
private final View mButtonBackgroundView;
private final View mButtonView;
private OnClickListener mOnClickListener;
public TvPipMenuActionButton(Context context) {
public TvWindowMenuActionButton(Context context) {
this(context, null, 0, 0);
}
public TvPipMenuActionButton(Context context, AttributeSet attrs) {
public TvWindowMenuActionButton(Context context, AttributeSet attrs) {
this(context, attrs, 0, 0);
}
public TvPipMenuActionButton(Context context, AttributeSet attrs, int defStyleAttr) {
public TvWindowMenuActionButton(Context context, AttributeSet attrs, int defStyleAttr) {
this(context, attrs, defStyleAttr, 0);
}
public TvPipMenuActionButton(
public TvWindowMenuActionButton(
Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
final LayoutInflater inflater = (LayoutInflater) getContext()
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
inflater.inflate(R.layout.tv_pip_menu_action_button, this);
inflater.inflate(R.layout.tv_window_menu_action_button, this);
mIconImageView = findViewById(R.id.icon);
mButtonView = findViewById(R.id.button);
@@ -129,20 +128,27 @@ public class TvPipMenuActionButton extends RelativeLayout implements View.OnClic
return mButtonView.isEnabled();
}
void setIsCustomCloseAction(boolean isCustomCloseAction) {
/**
* Marks this button as a custom close action button.
* This changes the style of the action button to highlight that this action finishes the
* Picture-in-Picture activity.
*
* @param isCustomCloseAction sets or unsets this button as a custom close action button.
*/
public void setIsCustomCloseAction(boolean isCustomCloseAction) {
mIconImageView.setImageTintList(
getResources().getColorStateList(
isCustomCloseAction ? R.color.tv_pip_menu_close_icon
: R.color.tv_pip_menu_icon));
isCustomCloseAction ? R.color.tv_window_menu_close_icon
: R.color.tv_window_menu_icon));
mButtonBackgroundView.setBackgroundTintList(getResources()
.getColorStateList(isCustomCloseAction ? R.color.tv_pip_menu_close_icon_bg
: R.color.tv_pip_menu_icon_bg));
.getColorStateList(isCustomCloseAction ? R.color.tv_window_menu_close_icon_bg
: R.color.tv_window_menu_icon_bg));
}
@Override
public String toString() {
if (mButtonView.getContentDescription() == null) {
return TvPipMenuActionButton.class.getSimpleName();
return TvWindowMenuActionButton.class.getSimpleName();
}
return mButtonView.getContentDescription().toString();
}

17
libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java
View File

@@ -56,6 +56,7 @@ import androidx.annotation.Nullable;
import com.android.internal.protolog.common.ProtoLog;
import com.android.wm.shell.R;
import com.android.wm.shell.common.TvWindowMenuActionButton;
import com.android.wm.shell.pip.PipUtils;
import com.android.wm.shell.protolog.ShellProtoLogGroup;
@@ -79,7 +80,7 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener {
private final LinearLayout mActionButtonsContainer;
private final View mMenuFrameView;
private final List<TvPipMenuActionButton> mAdditionalButtons = new ArrayList<>();
private final List<TvWindowMenuActionButton> mAdditionalButtons = new ArrayList<>();
private final View mPipFrameView;
private final View mPipView;
private final TextView mEduTextView;
@@ -94,7 +95,7 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener {
private final ImageView mArrowRight;
private final ImageView mArrowDown;
private final ImageView mArrowLeft;
private final TvPipMenuActionButton mA11yDoneButton;
private final TvWindowMenuActionButton mA11yDoneButton;
private final ScrollView mScrollView;
private final HorizontalScrollView mHorizontalScrollView;
@@ -104,8 +105,8 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener {
private boolean mMoveMenuIsVisible;
private boolean mButtonMenuIsVisible;
private final TvPipMenuActionButton mExpandButton;
private final TvPipMenuActionButton mCloseButton;
private final TvWindowMenuActionButton mExpandButton;
private final TvWindowMenuActionButton mCloseButton;
private boolean mSwitchingOrientation;
@@ -166,7 +167,7 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener {
mResizeAnimationDuration = context.getResources().getInteger(
R.integer.config_pipResizeAnimationDuration);
mPipMenuFadeAnimationDuration = context.getResources()
.getInteger(R.integer.pip_menu_fade_animation_duration);
.getInteger(R.integer.tv_window_menu_fade_animation_duration);
mPipMenuOuterSpace = context.getResources()
.getDimensionPixelSize(R.dimen.pip_menu_outer_space);
@@ -568,7 +569,7 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener {
if (actionsNumber > buttonsNumber) {
// Add buttons until we have enough to display all the actions.
while (actionsNumber > buttonsNumber) {
TvPipMenuActionButton button = new TvPipMenuActionButton(mContext);
TvWindowMenuActionButton button = new TvWindowMenuActionButton(mContext);
button.setOnClickListener(this);
mActionButtonsContainer.addView(button,
@@ -591,7 +592,7 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener {
// "Assign" actions to the buttons.
for (int index = 0; index < actionsNumber; index++) {
final RemoteAction action = actions.get(index);
final TvPipMenuActionButton button = mAdditionalButtons.get(index);
final TvWindowMenuActionButton button = mAdditionalButtons.get(index);
// Remove action if it matches the custom close action.
if (PipUtils.remoteActionsMatch(action, closeAction)) {
@@ -607,7 +608,7 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener {
}
}
private void setActionForButton(RemoteAction action, TvPipMenuActionButton button,
private void setActionForButton(RemoteAction action, TvWindowMenuActionButton button,
Handler mainHandler) {
button.setVisibility(View.VISIBLE); // Ensure the button is visible.
if (action.getContentDescription().length() > 0) {