From 83ccc8f7c52efd91a2742acbdb5cb64aa1d5871d Mon Sep 17 00:00:00 2001 From: Weng Su Date: Thu, 5 Aug 2021 22:24:23 +0800 Subject: [PATCH 1/4] The wifi dialog text should be Google Sans Text - Add fontFamily to override the "google-sans-text" font for SUW theme only. Bug: 195089787 Test: manual test make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest Change-Id: I578658fc82ad4d25e5e2e57868cd3aeecb2ab37f --- res/values/themes_suw.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml index 067ddfb558c..a0585fd9115 100644 --- a/res/values/themes_suw.xml +++ b/res/values/themes_suw.xml @@ -208,6 +208,8 @@ @*android:color/accent_device_default_dark @*android:dimen/config_dialogCornerRadius + + @*android:string/config_bodyFontFamily From ea07bb8d2f5abec307890d09350359dbba802e37 Mon Sep 17 00:00:00 2001 From: Curtis Belmonte Date: Mon, 9 Aug 2021 14:12:45 -0700 Subject: [PATCH 2/4] Make face education handle timeout result correctly Ensures that a result code of RESULT_TIMEOUT always causes the face enroll education screen to finish and propagate the result. Test: Lock and unlock screen at each stage of face enrollment Fixes: 194857793 Change-Id: Ie4b09235f923c8a40de18878b0727f166112140f --- .../settings/biometrics/face/FaceEnrollEducation.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java index 08cf5ff12f7..fa8f5564f2e 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java @@ -226,7 +226,10 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 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 @@ public class FaceEnrollEducation extends BiometricEnrollBase { setResult(resultCode, data); finish(); } - } else if (resultCode == RESULT_TIMEOUT) { - setResult(resultCode, data); - finish(); } } From 2a3920e44d97fc33f5c2cafda4fbd97eb5840a2a Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 9 Aug 2021 22:48:32 +0000 Subject: [PATCH 3/4] Use NEW_TASK|CLEAR_TOP when launching emergency app This flag combination will attempt to go to the existing emergency app task stack instead of creating duplicate ones. Fix: 193108390 Test: manual Change-Id: Ia9c9ead4e8b1d27582cdaff3e4d42c762e80709a --- .../settings/emergency/MoreSettingsPreferenceController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/emergency/MoreSettingsPreferenceController.java b/src/com/android/settings/emergency/MoreSettingsPreferenceController.java index cbb95a6357b..d945b2134e4 100644 --- a/src/com/android/settings/emergency/MoreSettingsPreferenceController.java +++ b/src/com/android/settings/emergency/MoreSettingsPreferenceController.java @@ -115,7 +115,7 @@ public class MoreSettingsPreferenceController extends BasePreferenceController i .logClickedPreference(mPreference, getMetricsCategory()); final Intent intent = new Intent(mIntent) .addCategory(Intent.CATEGORY_LAUNCHER) - .setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); Bundle bundle = new Bundle(); bundle.putString(EXTRA_KEY_ATTRIBUTION, mContext.getPackageName()); mContext.startActivity(intent, bundle); From a17fc042dd0a02536f5963cb602885c7d166e34d Mon Sep 17 00:00:00 2001 From: Tom Hsu Date: Mon, 9 Aug 2021 04:20:31 +0000 Subject: [PATCH 4/4] Selects a active sim to MobileNetworkActivity w/o subscription ID input Bug:194754151 Test: Sanity test with test build. See b/194754151#21 Change-Id: Ic3449392a7f564b69c3f42cc762ec4c9ec642797 --- .../settings/network/telephony/MobileNetworkActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java index b122cdc04b1..c6fe39c2a2b 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java +++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java @@ -257,6 +257,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity if (currentSubInfo == null) { currentSubInfo = subList.stream() .filter(SubscriptionAnnotation::isDisplayAllowed) + .filter(SubscriptionAnnotation::isActive) .findFirst().orElse(null); } return (currentSubInfo == null) ? null : currentSubInfo.getSubInfo();