From b884d607ec8f1ecf25a349c1e137dea9b5c80651 Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Fri, 14 May 2021 02:18:02 +0800
Subject: [PATCH] Create DialogTheme for Theme.SubSettingsBase

Bug: 177639355
Test: rebuild & verified in sample app

Change-Id: I5f122f590ce184f821147e323ce2d0af207149f1
---
 .../SettingsTheme/res/values-night-v31/colors.xml | 11 +++++++++--
 .../SettingsTheme/res/values-v31/colors.xml       |  9 ++++++++-
 .../SettingsTheme/res/values-v31/themes.xml       | 15 +++++++++++++++
 .../SettingsTheme/res/values/themes.xml           | 14 ++++++++++++++
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml
index df0e3e1d9641f..426a2ba447f21 100644
--- a/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2020 The Android Open Source Project
+  Copyright (C) 2021 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+<resources>
     <!-- Material next thumb off color-->
     <color name="settingslib_thumb_off_color">@android:color/system_neutral2_300</color>
 
@@ -24,4 +24,11 @@
 
     <!-- Material next track off color-->
     <color name="settingslib_track_off_color">@android:color/system_neutral1_700</color>
+
+    <!-- Dialog accent color -->
+    <color name="settingslib_dialog_accent">@android:color/system_accent1_100</color>
+    <!-- Dialog background color. -->
+    <color name="settingslib_dialog_background">@android:color/system_neutral1_800</color>
+    <!-- Dialog error color. -->
+    <color name="settingslib_dialog_colorError">#f28b82</color> <!-- Red 300 -->
 </resources>
\ No newline at end of file
diff --git a/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml
index 89e9a00513df5..fcba6bd95cb6b 100644
--- a/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2020 The Android Open Source Project
+  Copyright (C) 2021 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -30,4 +30,11 @@
 
     <!-- Material next track off color-->
     <color name="settingslib_track_off_color">@android:color/system_neutral2_600</color>
+
+    <!-- Dialog accent color -->
+    <color name="settingslib_dialog_accent">@android:color/system_accent1_600</color>
+    <!-- Dialog background color -->
+    <color name="settingslib_dialog_background">@android:color/system_neutral1_800</color>
+    <!-- Dialog error color. -->
+    <color name="settingslib_dialog_colorError">#d93025</color> <!-- Red 600 -->
 </resources>
diff --git a/packages/SettingsLib/SettingsTheme/res/values-v31/themes.xml b/packages/SettingsLib/SettingsTheme/res/values-v31/themes.xml
index adf506dc47cba..b3378b201f4df 100644
--- a/packages/SettingsLib/SettingsTheme/res/values-v31/themes.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values-v31/themes.xml
@@ -33,5 +33,20 @@
         <!-- Set up edge-to-edge configuration for top app bar -->
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="colorControlNormal">?android:attr/colorControlNormal</item>
+        <!-- For AndroidX AlertDialog -->
+        <item name="alertDialogTheme">@style/Theme.AlertDialog.SettingsLib</item>
+    </style>
+
+    <style name="Theme.AlertDialog.SettingsLib" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
+        <item name="colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorError">@color/settingslib_dialog_colorError</item>
+        <item name="android:colorBackground">@color/settingslib_dialog_background</item>
+
+        <item name="android:windowSoftInputMode">adjustResize</item>
+        <item name="android:clipToPadding">true</item>
+        <item name="android:clipChildren">true</item>
+
+        <item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/packages/SettingsLib/SettingsTheme/res/values/themes.xml b/packages/SettingsLib/SettingsTheme/res/values/themes.xml
index e856aa1a27804..6f2517746ddc6 100644
--- a/packages/SettingsLib/SettingsTheme/res/values/themes.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values/themes.xml
@@ -26,5 +26,19 @@
         <!-- Suppress the built-in action bar -->
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
+        <item name="colorControlNormal">?android:attr/colorControlNormal</item>
+        <!-- For AndroidX AlertDialog -->
+        <item name="alertDialogTheme">@style/Theme.AlertDialog.SettingsLib</item>
+    </style>
+
+    <style name="Theme.AlertDialog.SettingsLib" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
+        <!-- TODO(b/189308264): fix the crash in Android R if set the attributes:
+             <item name="colorAccent">@*android:color/accent_device_default_light</item>
+             <item name="android:colorBackground">@color/settingslib_dialog_background</item>
+             <item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        -->
+        <item name="android:windowSoftInputMode">adjustResize</item>
+        <item name="android:clipToPadding">true</item>
+        <item name="android:clipChildren">true</item>
     </style>
 </resources>