From b967f2c24fdd970dc6f811c592ab29128d8d5230 Mon Sep 17 00:00:00 2001
From: Galia Peycheva <galinap@google.com>
Date: Wed, 12 Aug 2020 17:14:55 +0200
Subject: [PATCH] Move the Tv volume dialog to a vertical layout

The CL sets the gravity of the volume dialog for TVs to
RIGHT|CENTER_VERTICAL.

It does the following:
1. Remove unnecessary margins and paddings in volume_dialog.xml, which
were either meant for phones or for the previous horizontal layout. The
new layout is generic and can be used both for horizontal and vertical
volume dialogs.
2. Adjust the elements in volume_dialog_row to the right,vertical ui

Bug: 162302410

Test: m && flash && verify that the volume ui is vertical
Change-Id: If55413f8c3ade1dcda594bcb765fa0ee9e30ee08
---
 .../layout-land-television/volume_dialog.xml  |  9 +----
 .../volume_dialog_row.xml                     | 39 +++++++++----------
 .../res/values-land-television/dimens.xml     |  5 ++-
 .../res/values-television/integers.xml        |  7 ++--
 4 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/packages/SystemUI/res/layout-land-television/volume_dialog.xml b/packages/SystemUI/res/layout-land-television/volume_dialog.xml
index 56d847c6aa2e5..8179bf48e7ab7 100644
--- a/packages/SystemUI/res/layout-land-television/volume_dialog.xml
+++ b/packages/SystemUI/res/layout-land-television/volume_dialog.xml
@@ -24,23 +24,17 @@
 
     <FrameLayout
         android:id="@+id/volume_dialog"
-        android:minWidth="@dimen/volume_dialog_panel_width"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="right"
         android:background="@android:color/transparent"
-        android:paddingRight="@dimen/volume_dialog_panel_transparent_padding_right"
-        android:paddingTop="@dimen/volume_dialog_panel_transparent_padding"
-        android:paddingBottom="@dimen/volume_dialog_panel_transparent_padding"
-        android:paddingLeft="@dimen/volume_dialog_panel_transparent_padding"
+        android:padding="@dimen/volume_dialog_panel_transparent_padding"
         android:clipToPadding="false">
 
         <LinearLayout
             android:id="@+id/main"
             android:layout_width="wrap_content"
-            android:minWidth="@dimen/volume_dialog_panel_width"
             android:layout_height="wrap_content"
-            android:layout_marginTop="68dp"
             android:layout_gravity="right"
             android:orientation="vertical"
             android:translationZ="@dimen/volume_dialog_elevation"
@@ -52,7 +46,6 @@
                 android:id="@+id/volume_dialog_rows"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:minWidth="@dimen/volume_dialog_panel_width"
                 android:gravity="center"
                 android:orientation="horizontal">
                 <!-- volume rows added and removed here! :-) -->
diff --git a/packages/SystemUI/res/layout-land-television/volume_dialog_row.xml b/packages/SystemUI/res/layout-land-television/volume_dialog_row.xml
index e9641936f3577..708dfd01975ac 100644
--- a/packages/SystemUI/res/layout-land-television/volume_dialog_row.xml
+++ b/packages/SystemUI/res/layout-land-television/volume_dialog_row.xml
@@ -16,8 +16,8 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:tag="row"
-    android:layout_width="@dimen/volume_dialog_row_width"
-    android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    android:layout_height="@dimen/volume_dialog_row_height"
     android:background="@android:color/transparent"
     android:clipChildren="false"
     android:clipToPadding="false"
@@ -30,15 +30,16 @@
         android:background="@android:color/transparent"
         android:gravity="center"
         android:layout_gravity="center"
-        android:orientation="horizontal" >
-        <com.android.keyguard.AlphaOptimizedImageButton
-            android:id="@+id/volume_row_icon"
-            style="@style/VolumeButtons"
+        android:orientation="vertical" >
+        <TextView
+            android:id="@+id/volume_number"
             android:layout_width="@dimen/tv_volume_dialog_bubble_size"
             android:layout_height="@dimen/tv_volume_dialog_bubble_size"
+            android:maxLength="2"
+            android:gravity="center"
             android:background="@drawable/tv_volume_dialog_circle"
-            android:tint="@color/accent_tint_color_selector"
-            android:soundEffectsEnabled="false" />
+            android:textSize="@dimen/tv_volume_number_text_size"
+            android:textColor="@color/accent_tint_color_selector"/>
         <TextView
             android:id="@+id/volume_row_header"
             android:layout_width="wrap_content"
@@ -51,28 +52,24 @@
             android:textAppearance="@style/TextAppearance.Volume.Header" />
         <FrameLayout
             android:id="@+id/volume_row_slider_frame"
-            android:layout_height="match_parent"
-            android:layoutDirection="ltr"
-            android:layout_width="@dimen/volume_dialog_row_width">
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/volume_dialog_row_height">
             <SeekBar
                 android:id="@+id/volume_row_slider"
                 android:clickable="false"
-                android:layout_width="@dimen/volume_dialog_row_width"
+                android:layout_width="@dimen/volume_dialog_row_height"
                 android:layout_height="match_parent"
-                android:layoutDirection="ltr"
                 android:layout_gravity="center"
-                android:rotation="0" />
+                android:rotation="270" />
         </FrameLayout>
-        <TextView
-            android:id="@+id/volume_number"
+        <com.android.keyguard.AlphaOptimizedImageButton
+            android:id="@+id/volume_row_icon"
+            style="@style/VolumeButtons"
             android:layout_width="@dimen/tv_volume_dialog_bubble_size"
             android:layout_height="@dimen/tv_volume_dialog_bubble_size"
-            android:maxLength="2"
-            android:gravity="center"
             android:background="@drawable/tv_volume_dialog_circle"
-            android:fontFeatureSettings="tnum"
-            android:textSize="@dimen/tv_volume_number_text_size"
-            android:textColor="@color/accent_tint_color_selector"/>
+            android:tint="@color/accent_tint_color_selector"
+            android:soundEffectsEnabled="false" />
     </LinearLayout>
 
     <include layout="@layout/volume_dnd_icon"/>
diff --git a/packages/SystemUI/res/values-land-television/dimens.xml b/packages/SystemUI/res/values-land-television/dimens.xml
index 90fc652b05e96..8237919990deb 100644
--- a/packages/SystemUI/res/values-land-television/dimens.xml
+++ b/packages/SystemUI/res/values-land-television/dimens.xml
@@ -15,8 +15,9 @@
 -->
 
 <resources>
-  <!-- Width of volume bar -->
-  <dimen name="volume_dialog_row_width">252dp</dimen>
+  <!-- Height of volume bar -->
+  <dimen name="volume_dialog_row_height">200dp</dimen>
+  <dimen name="volume_dialog_panel_transparent_padding">17dp</dimen>
   <dimen name="tv_volume_dialog_bubble_size">36dp</dimen>
   <dimen name="tv_volume_dialog_corner_radius">40dp</dimen>
   <dimen name="tv_volume_dialog_row_padding">5dp</dimen>
diff --git a/packages/SystemUI/res/values-television/integers.xml b/packages/SystemUI/res/values-television/integers.xml
index 91e83ccbbe791..587497edfdfb7 100644
--- a/packages/SystemUI/res/values-television/integers.xml
+++ b/packages/SystemUI/res/values-television/integers.xml
@@ -17,6 +17,7 @@
 <resources>
     <!-- The position of the volume dialog on the screen.
          See com.android.systemui.volume.VolumeDialogImpl.
-         Value 81 corresponds to BOTTOM|CENTER_HORIZONTAL. -->
-    <integer name="volume_dialog_gravity">81</integer>
-</resources>
\ No newline at end of file
+         Value 81 corresponds to BOTTOM|CENTER_HORIZONTAL.
+         Value 21 corresponds to RIGHT|CENTER_VERTICAL. -->
+    <integer name="volume_dialog_gravity">21</integer>
+</resources>