From 52e2ea6ef0e6225dc56f3f7a37a1042428cfe618 Mon Sep 17 00:00:00 2001
From: Josh Tsuji <tsuji@google.com>
Date: Fri, 25 Jun 2021 13:21:29 -0400
Subject: [PATCH] Make the DND icon look a little less completely broken.

Screenshot: https://screenshot.googleplex.com/6CzRvLUcRDRt9uj.png

I don't even have mocks for this, I'll ask UX for what this should actually look like, but it's better than being offset behind and to the right of the row like it is now.

Fixes: 192080118
Test: use dnd
Change-Id: I6b1d03547a3711f48fb7a0e84c1c7ed8929f20ea
---
 packages/SystemUI/res/layout/volume_dialog_row.xml | 2 +-
 packages/SystemUI/res/layout/volume_dnd_icon.xml   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/res/layout/volume_dialog_row.xml b/packages/SystemUI/res/layout/volume_dialog_row.xml
index ee89b97a4a9c5..c9256ae5123be 100644
--- a/packages/SystemUI/res/layout/volume_dialog_row.xml
+++ b/packages/SystemUI/res/layout/volume_dialog_row.xml
@@ -46,7 +46,6 @@
             android:id="@+id/volume_row_slider_frame"
             android:layout_width="match_parent"
             android:layout_height="@dimen/volume_row_slider_height">
-            <include layout="@layout/volume_dnd_icon"/>
             <SeekBar
                 android:id="@+id/volume_row_slider"
                 android:paddingLeft="0dp"
@@ -63,6 +62,7 @@
                 android:background="@null"
                 android:layoutDirection="ltr"
                 android:rotation="270" />
+            <include layout="@layout/volume_dnd_icon"/>
         </FrameLayout>
 
         <com.android.keyguard.AlphaOptimizedImageButton
diff --git a/packages/SystemUI/res/layout/volume_dnd_icon.xml b/packages/SystemUI/res/layout/volume_dnd_icon.xml
index 10c1472ae9930..56587b99b80be 100644
--- a/packages/SystemUI/res/layout/volume_dnd_icon.xml
+++ b/packages/SystemUI/res/layout/volume_dnd_icon.xml
@@ -18,12 +18,14 @@
     android:id="@+id/dnd_icon"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="6dp">
+    android:layout_gravity="bottom"
+    android:layout_marginTop="6dp"
+    android:layout_marginBottom="6dp">
 
     <ImageView
         android:layout_width="14dp"
         android:layout_height="14dp"
-        android:layout_gravity="right|top"
+        android:layout_gravity="center"
         android:src="@*android:drawable/ic_qs_dnd"
         android:tint="?android:attr/textColorTertiary"/>
 </FrameLayout>
\ No newline at end of file