From e1e326ec03479be4c738f8438610bbbfd1900a6a Mon Sep 17 00:00:00 2001
From: helencheuk <helencheuk@google.com>
Date: Tue, 1 Oct 2024 17:20:13 +0100
Subject: [Contextual Edu] Show dialog with correct theme in light and dark
 modes

Found an issue that the edu dialog is always in dark theme.
This change provides the correct theme for light and dark modes.

Bug: 369800039
Test: Manual, checked the color of dialog is right in both light and dark themes
Flag: com.android.systemui.keyboard_touchpad_contextual_education
Change-Id: Ifa313a4bb28716cca5b1f12c12fbcec6d7e6b955
---
 packages/SystemUI/res/values-night/styles.xml | 5 +++++
 packages/SystemUI/res/values/styles.xml       | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml
index e9dd039f38c2..7bd4ca8b940b 100644
--- a/packages/SystemUI/res/values-night/styles.xml
+++ b/packages/SystemUI/res/values-night/styles.xml
@@ -64,4 +64,9 @@
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 
+    <style name="ContextualEduDialog" parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar">
+        <!-- To make the dialog wrap to content when the education text is short -->
+        <item name="windowMinWidthMajor">0%</item>
+        <item name="windowMinWidthMinor">0%</item>
+    </style>
 </resources>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index b34d6e4067b6..1c09f84b6fd0 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -1721,7 +1721,7 @@
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 
-    <style name="ContextualEduDialog" parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar">
+    <style name="ContextualEduDialog" parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar">
         <!-- To make the dialog wrap to content when the education text is short -->
         <item name="windowMinWidthMajor">0%</item>
         <item name="windowMinWidthMinor">0%</item>
-- 
cgit v1.2.3-59-g8ed1b