diff options
5 files changed, 10 insertions, 7 deletions
diff --git a/packages/SystemUI/res/layout/volume_zen_footer.xml b/packages/SystemUI/res/layout/volume_zen_footer.xml index 91dc6178cd86..38627b6546cb 100644 --- a/packages/SystemUI/res/layout/volume_zen_footer.xml +++ b/packages/SystemUI/res/layout/volume_zen_footer.xml @@ -51,8 +51,7 @@ android:clickable="true" android:contentDescription="@string/accessibility_desc_close" android:scaleType="center" - android:src="@drawable/ic_close" - android:tint="@android:color/white" /> + android:src="@drawable/ic_close_white" /> <TextView android:id="@+id/zen_introduction_message" @@ -128,4 +127,4 @@ android:textColor="?android:attr/colorAccent" android:textAppearance="@style/TextAppearance.QS.DetailButton" /> -</com.android.systemui.volume.ZenFooter>
\ No newline at end of file +</com.android.systemui.volume.ZenFooter> diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml index 200eabf80e4e..426164186aba 100644 --- a/packages/SystemUI/res/layout/zen_mode_panel.xml +++ b/packages/SystemUI/res/layout/zen_mode_panel.xml @@ -59,8 +59,7 @@ android:clickable="true" android:contentDescription="@string/accessibility_desc_close" android:scaleType="center" - android:src="@drawable/ic_close" - android:tint="@android:color/white" /> + android:src="@drawable/ic_close_white" /> <TextView android:id="@+id/zen_introduction_message" diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index 0ab44ed85ec8..054d520c13e3 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -146,4 +146,6 @@ <color name="instant_apps_color">#ff4d5a64</color> + <color name="zen_introduction">#ffffffff</color> + </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index daed847c2ac3..7180ea60707d 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -220,6 +220,7 @@ <style name="TextAppearance.QS.Introduction"> <item name="android:textSize">14sp</item> + <item name="android:textColor">@color/zen_introduction</item> </style> <style name="TextAppearance.QS.Warning"> @@ -236,7 +237,7 @@ </style> <style name="TextAppearance.QS.DetailButton.White"> - <item name="android:textColor">@color/qs_detail_button_white</item> + <item name="android:textColor">@color/zen_introduction</item> </style> <style name="TextAppearance.QS.DetailEmpty"> diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java index 17d98b19277e..74642129b197 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java @@ -111,7 +111,9 @@ public class ZenFooter extends LinearLayout { if (mZen == zen) return; mZen = zen; update(); - updateIntroduction(); + post(() -> { + updateIntroduction(); + }); } private void setConfig(ZenModeConfig config) { |