Merge "Fix AlertActivity child objects dark theme problem"

This commit is contained in:
Arc Wang
2020-07-01 01:07:11 +00:00
committed by Android (Google) Code Review

View File

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