Snap for 7625910 from 9000bdc25f1af356cec65c2d32d8d33b5d2a8b8b to sc-release
Change-Id: I00ad85b57cad05f18eb774bcbf80065eb023a0f7
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cf43731..9b2cf24 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2862,9 +2862,7 @@
<activity android:name=".notification.app.ChannelPanelActivity"
android:label="@string/notification_channel_title"
android:theme="@style/Theme.Panel"
- android:launchMode="singleInstance"
android:excludeFromRecents="true"
- android:noHistory="true"
android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="true">
<intent-filter android:priority="1">
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index 067ddfb..a0585fd 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -208,6 +208,8 @@
<!-- copied from Theme.DeviceDefault.Dialog.Alert -->
<item name="colorAccent">@*android:color/accent_device_default_dark</item>
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
<style name="SuwAlertDialogThemeCompat.Light" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
@@ -218,6 +220,8 @@
<!-- copied from Theme.DeviceDefault.Light.Dialog.Alert -->
<item name="colorAccent">@*android:color/accent_device_default_light</item>
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
<!-- This theme was applied to Settings pages which are running under SUW. -->