From 205846c9a2330bde7d2c70fc8f3d3fb37c79a9f3 Mon Sep 17 00:00:00 2001
From: Tim Peng <timhypeng@google.com>
Date: Thu, 16 Apr 2020 14:09:53 +0800
Subject: [PATCH] Refine inputRange layout in output switcher

Bug: 154181365
Test: build pass
Change-Id: Idee9042af6b19a358938752d2ee72bae07eb092a
---
 res/layout/panel_layout.xml           |  8 ++++----
 res/layout/panel_slice_slider_row.xml |  4 ++--
 res/values/styles.xml                 | 24 +++++++++++++++++++++---
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/res/layout/panel_layout.xml b/res/layout/panel_layout.xml
index 7a60dad2431..805d431b82a 100644
--- a/res/layout/panel_layout.xml
+++ b/res/layout/panel_layout.xml
@@ -36,11 +36,11 @@
             android:visibility="gone">
 
             <LinearLayout
-                android:layout_width="49dp"
-                android:layout_height="49dp"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
                 android:gravity="center_vertical|center_horizontal"
                 android:orientation="horizontal"
-                android:layout_marginStart="10dp">
+                android:layout_marginStart="16dp">
                 <ImageView
                     android:id="@+id/title_icon"
                     android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="25dp"
+                android:layout_marginStart="16dp"
                 android:gravity="center_vertical"
                 android:orientation="vertical"
                 android:paddingBottom="9dp"
diff --git a/res/layout/panel_slice_slider_row.xml b/res/layout/panel_slice_slider_row.xml
index f886a85ec8c..ff2b10fb2b6 100644
--- a/res/layout/panel_slice_slider_row.xml
+++ b/res/layout/panel_slice_slider_row.xml
@@ -25,6 +25,6 @@
         style="@style/SliceViewSliderStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"/>
+        android:paddingStart="0dp"
+        android:paddingEnd="0dp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 848eaf14bd9..601d793b1a2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -511,10 +511,28 @@
         <item name="android:background">?android:attr/colorBackgroundFloating</item>
     </style>
 
-    <style name="SliceRowSliderStyle" parent="SliceRowStyle">
+    <style name="SliceRowSliderStyle">
+        <!-- 2dp start padding for the start icon -->
+        <item name="titleItemStartPadding">10dp</item>
+        <item name="titleItemEndPadding">0dp</item>
+
+        <!-- Padding between content and the start icon is 14dp -->
+        <item name="contentStartPadding">5dp</item>
+        <!-- Padding between content and end items is 16dp -->
+        <item name="contentEndPadding">16dp</item>
+
+        <!-- Both side margins of end item are 16dp -->
+        <item name="endItemStartPadding">0dp</item>
+        <item name="endItemEndPadding">24dp</item>
+
+        <!-- Both side margins of bottom divider are 12dp -->
+        <item name="bottomDividerStartPadding">12dp</item>
+        <item name="bottomDividerEndPadding">12dp</item>
+
+        <item name="actionDividerHeight">32dp</item>
         <!-- Align text with slider -->
-        <item name="titleStartPadding">12dp</item>
-        <item name="subContentStartPadding">12dp</item>
+        <item name="titleStartPadding">6dp</item>
+        <item name="subContentStartPadding">6dp</item>
     </style>
 
     <style name="ContextualCardSliceViewStyle" parent="SliceViewStyle">