From 5a298fbde0d9e889f987a7f328f1f38ae3dbd020 Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Tue, 30 Jun 2020 14:14:02 +0800
Subject: [PATCH] Fix AlertActivity child objects dark theme problem

In Settings, AlertActivity child objects use the theme
which is not compatible with dark theme.
Use @*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight
to fix dark theme problem.

Bug: 157961813
Test: manual visual
Change-Id: I49decbd51a4346c65c9b40dbe056687337b4b385
---
 AndroidManifest.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7a767b10a73..13d9296659c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -372,7 +372,7 @@
                   android:excludeFromRecents="true"
                   android:exported="true"
                   android:permission="android.permission.NETWORK_STACK"
-                  android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+                  android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">
             <intent-filter>
                 <action android:name="android.net.conn.PROMPT_UNVALIDATED" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1113,7 +1113,7 @@
             android:name=".fuelgauge.RequestIgnoreBatteryOptimizations"
             android:label="@string/high_power_apps"
             android:exported="true"
-            android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+            android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2142,7 +2142,7 @@
                   android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH"
-                  android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+                  android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">
         </activity>
 
         <service android:name=".bluetooth.BluetoothPairingService" />
@@ -2178,7 +2178,7 @@
 
         <activity android:name="ActivityPicker"
                 android:label="@string/activity_picker_label"
-                android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"
+                android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"
                 android:exported="true"
                 android:finishOnCloseSystemDialogs="true">
             <intent-filter android:priority="1">
@@ -2231,7 +2231,7 @@
         <!-- Standard picker for widgets -->
         <activity android:name="AppWidgetPickActivity"
                 android:label="@string/widget_picker_title"
-                android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"
+                android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"
                 android:exported="true"
                 android:finishOnCloseSystemDialogs="true">
             <intent-filter android:priority="1">
@@ -2241,7 +2241,7 @@
         </activity>
 
         <activity android:name="AllowBindAppWidgetActivity"
-                android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"
+                android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"
                 android:finishOnCloseSystemDialogs="true"
                 android:exported="true"
                 android:excludeFromRecents="true">