diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-14 01:04:43 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-14 01:04:43 +0000 |
| commit | db4e05e246dc83f0f215429072d5173c389c5827 (patch) | |
| tree | 38ac2641bca85c9bab6814231ffa907408abfa30 | |
| parent | 326be075a2fcad24e66ccdad409ed0a4e5fba726 (diff) | |
| parent | 0cd936d517f2f1e55733db015be5890dfe18def7 (diff) | |
| download | CellBroadcastReceiver-db4e05e246dc83f0f215429072d5173c389c5827.tar.gz | |
Snap for 6676900 from 0cd936d517f2f1e55733db015be5890dfe18def7 to rvc-releaseandroid-vts-11.0_r1android-security-11.0.0_r1android-platform-11.0.0_r1android-cts-11.0_r2android-cts-11.0_r1android-11.0.0_r6android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r1android11-s1-release
Change-Id: Ie83f5dfed5c167f11dab2d49be51f4bc3c01cc73
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | res/values/overlayable.xml | 2 | ||||
| -rw-r--r-- | res/values/themes.xml | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3911fe226..d3c6ebe8c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -108,7 +108,7 @@ android:exported="true" /> <activity android:name="com.android.cellbroadcastreceiver.CellBroadcastAlertDialog" - android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" + android:theme="@style/CellBroadcastAlertTheme" android:launchMode="singleTask" android:exported="false" android:excludeFromRecents="true" diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml index 86401879b..b1be57b66 100644 --- a/res/values/overlayable.xml +++ b/res/values/overlayable.xml @@ -22,7 +22,7 @@ <!-- START VENDOR CUSTOMIZATION --> <policy type="product|system|vendor"> <!-- START THEME / STYLE --> - <item type="style" name="AlertFullScreenTheme"/> + <item type="style" name="CellBroadcastAlertTheme"/> <item type="style" name="PreferenceTheme"/> <item type="style" name="CellBroadcastSettingsTheme"/> <!-- END THEME / STYLE --> diff --git a/res/values/themes.xml b/res/values/themes.xml index 3ec1ce1ca..2028aa597 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -19,8 +19,7 @@ --> <resources> - <!-- This must be a fullscreen theme for the alarm to be able to turn the screen on. --> - <style name="AlertFullScreenTheme" parent="android:Theme.Material.Wallpaper.NoTitleBar" /> + <style name="CellBroadcastAlertTheme" parent="android:Theme.DeviceDefault.Light.Dialog" /> <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material"> <item name="switchPreferenceStyle">@style/SettingsSwitchPreference</item> |