From 894e5b9577a1b6c10f72eacb68bfe0107250e973 Mon Sep 17 00:00:00 2001
From: Jacqueline Bronger <bronger@google.com>
Date: Tue, 9 Aug 2022 17:48:55 +0200
Subject: [PATCH] Add dim layer to PiP menu below buttons

Only show the dim when the menu buttons are shown to improve their
visibility.

Bug: 241744433
Test: manual - open a PiP and go to the menu. PiP content should get
darker. After pressing the back button or when entering the move menu
the dim should disappear.

Change-Id: I67256421994931467f2bc499bad5d5785213304a
---
 libs/WindowManager/Shell/res/layout/tv_pip_menu.xml        | 7 +++++++
 libs/WindowManager/Shell/res/values/colors_tv.xml          | 1 +
 .../src/com/android/wm/shell/pip/tv/TvPipMenuView.java     | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/libs/WindowManager/Shell/res/layout/tv_pip_menu.xml b/libs/WindowManager/Shell/res/layout/tv_pip_menu.xml
index 75011957e4d8b..b0dab90b6add6 100644
--- a/libs/WindowManager/Shell/res/layout/tv_pip_menu.xml
+++ b/libs/WindowManager/Shell/res/layout/tv_pip_menu.xml
@@ -37,6 +37,13 @@
             android:background="@color/tv_pip_menu_background"
             android:alpha="0"/>
 
+        <View
+            android:id="@+id/tv_pip_menu_dim_layer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/tv_pip_menu_dim_layer"
+            android:alpha="0"/>
+
         <ScrollView
             android:id="@+id/tv_pip_menu_scroll"
             android:layout_width="match_parent"
diff --git a/libs/WindowManager/Shell/res/values/colors_tv.xml b/libs/WindowManager/Shell/res/values/colors_tv.xml
index 3e71c1010278f..e6933ca3fce62 100644
--- a/libs/WindowManager/Shell/res/values/colors_tv.xml
+++ b/libs/WindowManager/Shell/res/values/colors_tv.xml
@@ -25,6 +25,7 @@
     <color name="tv_window_menu_icon_bg_unfocused">#990E0E0F</color>
 
     <color name="tv_pip_menu_focus_border">#E8EAED</color>
+    <color name="tv_pip_menu_dim_layer">#990E0E0F</color>
     <color name="tv_pip_menu_background">#1E232C</color>
 
     <color name="tv_pip_edu_text">#99D2E3FC</color>
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java
index ef20a86d518e4..97e017a65b04a 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java
@@ -98,6 +98,7 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener {
     private final TvWindowMenuActionButton mA11yDoneButton;
 
     private final View mPipBackground;
+    private final View mDimLayer;
 
     private final ScrollView mScrollView;
     private final HorizontalScrollView mHorizontalScrollView;
@@ -151,6 +152,7 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener {
         mExpandButton.setOnClickListener(this);
 
         mPipBackground = findViewById(R.id.tv_pip_menu_background);
+        mDimLayer = findViewById(R.id.tv_pip_menu_dim_layer);
 
         mScrollView = findViewById(R.id.tv_pip_menu_scroll);
         mHorizontalScrollView = findViewById(R.id.tv_pip_menu_horizontal_scroll);
@@ -774,6 +776,7 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener {
             refocusPreviousButton();
         }
         animateAlphaTo(show ? 1 : 0, mActionButtonsContainer);
+        animateAlphaTo(show ? 1 : 0, mDimLayer);
     }
 
     private void setFrameHighlighted(boolean highlighted) {