summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-06-25 22:11:24 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-06-25 22:11:24 +0000
commita1228e05ffc00533f8c93987c1bcca7cab1c1fbb (patch)
tree9621f12652fb1a3e54ccdaeea47535ca7239fa9d
parent1da53a25400a8ceaddf31cc08e28ed8901f467ed (diff)
parent52e2ea6ef0e6225dc56f3f7a37a1042428cfe618 (diff)
Merge "Make the DND icon look a little less completely broken." into sc-dev
-rw-r--r--packages/SystemUI/res/layout/volume_dialog_row.xml2
-rw-r--r--packages/SystemUI/res/layout/volume_dnd_icon.xml6
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 ee89b97a4a9c..c9256ae5123b 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 10c1472ae993..56587b99b80b 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