Volume: new coat of paint.

- Two sections (lighter header, darker detail) like QS.
- Fewer text variants.
- Remove backgrounds for segmented buttons.
- Remove alarm warning background.
- Fix slider-only style.
- Ensure all touch-targets are 48dp.

Bug:16419191

Change-Id: I220f3a736eba3dd7a1b9ff58a8fe4bf3d21db61a

6 files changed, 52 insertions, 44 deletions

diff --git a/packages/SystemUI/res/layout/qs_panel.xml b/packages/SystemUI/res/layout/qs_panel.xml
index d0a07ad..087bf07 100644
--- a/packages/SystemUI/res/layout/qs_panel.xml
+++ b/packages/SystemUI/res/layout/qs_panel.xml
@@ -18,7 +18,7 @@
         android:id="@+id/quick_settings_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/qs_panel_background"
+        android:background="@drawable/qs_background_primary"
         android:elevation="2dp">
 
     <com.android.systemui.qs.QSPanel
diff --git a/packages/SystemUI/res/layout/segmented_button.xml b/packages/SystemUI/res/layout/segmented_button.xml
index 538e434..9953b46 100644
--- a/packages/SystemUI/res/layout/segmented_button.xml
+++ b/packages/SystemUI/res/layout/segmented_button.xml
@@ -20,7 +20,7 @@
     android:layout_marginStart="@dimen/segmented_button_spacing"
     android:layout_weight="1"
     android:textColor="@color/segmented_button_text_selector"
-    android:background="@drawable/segmented_button"
+    android:background="@drawable/btn_borderless_rect"
     android:textAppearance="@style/TextAppearance.QS.SegmentedButton"
-    android:minHeight="0dp"
+    android:minHeight="36dp"
     android:padding="10dp" />
diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml
index 7bd0aea..112f3a9 100644
--- a/packages/SystemUI/res/layout/volume_dialog.xml
+++ b/packages/SystemUI/res/layout/volume_dialog.xml
@@ -17,7 +17,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/volume_panel_width"
     android:layout_height="wrap_content"
-    android:background="@drawable/qs_panel_background"
+    android:background="@drawable/qs_background_primary"
     android:translationZ="@dimen/volume_panel_z"
     android:layout_marginBottom="@dimen/volume_panel_z">
 
diff --git a/packages/SystemUI/res/layout/volume_panel.xml b/packages/SystemUI/res/layout/volume_panel.xml
index 6416308..c85a750 100644
--- a/packages/SystemUI/res/layout/volume_panel.xml
+++ b/packages/SystemUI/res/layout/volume_panel.xml
@@ -18,20 +18,21 @@
     android:id="@+id/visible_panel"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="8dp"
     android:orientation="vertical" >
 
     <FrameLayout
         android:id="@+id/slider_panel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/system_secondary_color"
+        android:paddingTop="12dp"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
         android:clipChildren="false" />
 
-     <ViewStub
-        android:id="@+id/zen_panel_stub"
+     <include
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inflatedId="@+id/zen_panel"
-        android:layout="@layout/zen_mode_panel" />
+        layout="@layout/zen_mode_panel" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/volume_panel_item.xml b/packages/SystemUI/res/layout/volume_panel_item.xml
index b1dd237..18b496c 100644
--- a/packages/SystemUI/res/layout/volume_panel_item.xml
+++ b/packages/SystemUI/res/layout/volume_panel_item.xml
@@ -23,22 +23,20 @@
 
     <ImageView
         android:id="@+id/stream_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@null"
-        android:paddingBottom="10dip"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
-        android:paddingTop="10dip" />
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:scaleType="center"
+        android:background="@drawable/btn_borderless_rect"
+        android:contentDescription="@null" />
 
     <SeekBar
         android:id="@+id/seekbar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingBottom="0dip"
-        android:paddingEnd="17dip"
-        android:paddingStart="0dip"
+        android:paddingBottom="0dp"
+        android:paddingEnd="16dp"
+        android:paddingStart="8dp"
         android:paddingTop="0dip" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml
index b0e43fc..aa8d114 100644
--- a/packages/SystemUI/res/layout/zen_mode_panel.xml
+++ b/packages/SystemUI/res/layout/zen_mode_panel.xml
@@ -19,51 +19,59 @@
     android:id="@+id/zen_mode_panel"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/qs_panel_background"
     android:clipChildren="false"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/qs_panel_padding" >
+    android:orientation="vertical" >
 
-    <com.android.systemui.volume.SegmentedButtons
-        android:id="@+id/zen_buttons"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/qs_panel_padding"
-        android:layout_marginRight="@dimen/qs_panel_padding"
-        android:layout_marginTop="12dp"
-        android:background="@drawable/segmented_buttons"
-        android:clipChildren="false" />
+        android:minHeight="12dp"
+        android:background="@drawable/qs_background_secondary" >
+
+        <com.android.systemui.volume.SegmentedButtons
+            android:id="@+id/zen_buttons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/qs_panel_padding"
+            android:layout_marginRight="@dimen/qs_panel_padding"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="12dp"
+            android:clipChildren="false" />
+    </FrameLayout>
 
     <FrameLayout
         android:id="@+id/zen_subhead"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/qs_panel_padding"
-        android:paddingRight="@dimen/qs_panel_padding"
-        android:paddingTop="@dimen/qs_panel_padding" >
+        android:layout_height="62dp"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp" >
 
         <TextView
             android:id="@+id/zen_subhead_collapsed"
             android:layout_width="wrap_content"
-            android:layout_height="32dp"
+            android:layout_height="48dp"
+            android:layout_gravity="center_vertical"
+            android:gravity="center_vertical"
+            android:paddingLeft="8dp"
             android:background="@drawable/btn_borderless_rect"
             android:clickable="true"
             android:drawableEnd="@drawable/qs_subhead_caret"
-            android:gravity="center_vertical"
             android:textAppearance="@style/TextAppearance.QS.Subhead" />
 
         <TextView
             android:id="@+id/zen_subhead_expanded"
             android:layout_width="wrap_content"
-            android:layout_height="32dp"
+            android:layout_height="48dp"
+            android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
+            android:paddingLeft="8dp"
             android:textAppearance="@style/TextAppearance.QS.Subhead" />
 
         <ImageView
             android:id="@+id/zen_more_settings"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_gravity="end"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_gravity="end|center_vertical"
             android:background="@drawable/btn_borderless_rect"
             android:clickable="true"
             android:contentDescription="@null"
@@ -76,15 +84,16 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingTop="3dp" />
+        android:paddingBottom="@dimen/qs_panel_padding" />
 
     <TextView
         android:id="@+id/zen_alarm_warning"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_marginTop="@dimen/qs_panel_padding"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/qs_panel_padding"
         android:paddingLeft="@dimen/qs_panel_padding"
         android:paddingRight="@dimen/qs_panel_padding"
-        android:gravity="center_vertical"
-        android:textAppearance="@style/TextAppearance.QS.DetailEmpty" />
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
+        android:textAppearance="@style/TextAppearance.QS.Subhead" />
 </com.android.systemui.volume.ZenModePanel>
\ No newline at end of file