Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev
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. -->
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
index 08cf5ff..fa8f556 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
@@ -226,7 +226,10 @@
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
mResultIntent = data;
- if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST
+ if (resultCode == RESULT_TIMEOUT) {
+ setResult(resultCode, data);
+ finish();
+ } else if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST
|| requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST) {
// If the user finished or skipped enrollment, finish this activity
if (resultCode == RESULT_SKIP || resultCode == RESULT_FINISHED
@@ -234,9 +237,6 @@
setResult(resultCode, data);
finish();
}
- } else if (resultCode == RESULT_TIMEOUT) {
- setResult(resultCode, data);
- finish();
}
}