From 1a848af46fb5798c495bdd673079e34bcb922312 Mon Sep 17 00:00:00 2001 From: Fabian Kozynski Date: Fri, 19 Nov 2021 14:57:47 -0500 Subject: [PATCH] Create style for AlertDialog in SystemUI This creates the style up to the design spec and customizes the following: * Dialog icon on top of title * Font sizes and colors * Buttons * Padding Using R.style.Theme_SystemUI_Dialog for an AlertDialog (or preferably a SystemUIDialog) will make sure that the correct style is applied. Test: manual, using a test dialog Fixes: 203666386 Change-Id: Ied39acb05295dea1e1e353ef504d013900a97266 Merged-In: Ied39acb05295dea1e1e353ef504d013900a97266 --- .../res/color/prv_text_color_on_accent.xml | 20 ---- .../res/drawable/qs_dialog_btn_filled.xml | 12 +-- .../res/drawable/qs_dialog_btn_outline.xml | 12 +-- .../alert_dialog_button_bar_systemui.xml | 63 +++++++++++++ .../res/layout/alert_dialog_systemui.xml | 91 +++++++++++++++++++ .../layout/alert_dialog_title_systemui.xml | 63 +++++++++++++ .../res/layout/qs_user_dialog_content.xml | 6 +- packages/SystemUI/res/values-night/styles.xml | 4 +- packages/SystemUI/res/values/dimens.xml | 15 ++- packages/SystemUI/res/values/styles.xml | 45 ++++++--- 10 files changed, 278 insertions(+), 53 deletions(-) delete mode 100644 packages/SystemUI/res/color/prv_text_color_on_accent.xml create mode 100644 packages/SystemUI/res/layout/alert_dialog_button_bar_systemui.xml create mode 100644 packages/SystemUI/res/layout/alert_dialog_systemui.xml create mode 100644 packages/SystemUI/res/layout/alert_dialog_title_systemui.xml diff --git a/packages/SystemUI/res/color/prv_text_color_on_accent.xml b/packages/SystemUI/res/color/prv_text_color_on_accent.xml deleted file mode 100644 index 9f44acadb420c..0000000000000 --- a/packages/SystemUI/res/color/prv_text_color_on_accent.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/qs_dialog_btn_filled.xml b/packages/SystemUI/res/drawable/qs_dialog_btn_filled.xml index 1a128dfe8b109..14cb1de9fa2dc 100644 --- a/packages/SystemUI/res/drawable/qs_dialog_btn_filled.xml +++ b/packages/SystemUI/res/drawable/qs_dialog_btn_filled.xml @@ -16,8 +16,8 @@ --> + android:insetTop="@dimen/dialog_button_vertical_inset" + android:insetBottom="@dimen/dialog_button_vertical_inset"> @@ -29,10 +29,10 @@ - + diff --git a/packages/SystemUI/res/drawable/qs_dialog_btn_outline.xml b/packages/SystemUI/res/drawable/qs_dialog_btn_outline.xml index 467c20f3ffcd0..665b4564ebf15 100644 --- a/packages/SystemUI/res/drawable/qs_dialog_btn_outline.xml +++ b/packages/SystemUI/res/drawable/qs_dialog_btn_outline.xml @@ -16,8 +16,8 @@ --> + android:insetTop="@dimen/dialog_button_vertical_inset" + android:insetBottom="@dimen/dialog_button_vertical_inset"> @@ -32,10 +32,10 @@ - + diff --git a/packages/SystemUI/res/layout/alert_dialog_button_bar_systemui.xml b/packages/SystemUI/res/layout/alert_dialog_button_bar_systemui.xml new file mode 100644 index 0000000000000..a3e289a42d052 --- /dev/null +++ b/packages/SystemUI/res/layout/alert_dialog_button_bar_systemui.xml @@ -0,0 +1,63 @@ + + + + + + +