PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 7628048 from f923361f32 to sc-v2-release

Browse Source 
Change-Id: Ifbce8f3bb14acb2e1f9332433bd2499c83df45c2
This commit is contained in:
Android Build Coastguard Worker
2021-08-10 23:09:07 +00:00
parent 52b6a02642 f923361f32
commit b20dbe34ee
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/themes_suw.xml
View File

@@ -208,6 +208,8 @@
<!-- copied from Theme.DeviceDefault.Dialog.Alert --> <!-- copied from Theme.DeviceDefault.Dialog.Alert -->
<item name="colorAccent">@*android:color/accent_device_default_dark</item> <item name="colorAccent">@*android:color/accent_device_default_dark</item>
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item> <item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style> </style>
<style name="SuwAlertDialogThemeCompat.Light" parent="@style/Theme.AppCompat.Light.Dialog.Alert"> <style name="SuwAlertDialogThemeCompat.Light" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
@@ -218,6 +220,8 @@
<!-- copied from Theme.DeviceDefault.Light.Dialog.Alert --> <!-- copied from Theme.DeviceDefault.Light.Dialog.Alert -->
<item name="colorAccent">@*android:color/accent_device_default_light</item> <item name="colorAccent">@*android:color/accent_device_default_light</item>
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item> <item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style> </style>
<!-- This theme was applied to Settings pages which are running under SUW. --> <!-- This theme was applied to Settings pages which are running under SUW. -->

8
src/com/android/settings/biometrics/face/FaceEnrollEducation.java
View File

@@ -226,7 +226,10 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
mResultIntent = 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) { || requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST) {
// If the user finished or skipped enrollment, finish this activity // If the user finished or skipped enrollment, finish this activity
if (resultCode == RESULT_SKIP || resultCode == RESULT_FINISHED if (resultCode == RESULT_SKIP || resultCode == RESULT_FINISHED
@@ -234,9 +237,6 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
setResult(resultCode, data); setResult(resultCode, data);
finish(); finish();
} }
} else if (resultCode == RESULT_TIMEOUT) {
setResult(resultCode, data);
finish();
} }
} }

2
src/com/android/settings/emergency/MoreSettingsPreferenceController.java
View File

@@ -115,7 +115,7 @@ public class MoreSettingsPreferenceController extends BasePreferenceController i
.logClickedPreference(mPreference, getMetricsCategory()); .logClickedPreference(mPreference, getMetricsCategory());
final Intent intent = new Intent(mIntent) final Intent intent = new Intent(mIntent)
.addCategory(Intent.CATEGORY_LAUNCHER) .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 bundle = new Bundle();
bundle.putString(EXTRA_KEY_ATTRIBUTION, mContext.getPackageName()); bundle.putString(EXTRA_KEY_ATTRIBUTION, mContext.getPackageName());
mContext.startActivity(intent, bundle); mContext.startActivity(intent, bundle);

1
src/com/android/settings/network/telephony/MobileNetworkActivity.java
View File

@@ -257,6 +257,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
if (currentSubInfo == null) { if (currentSubInfo == null) {
currentSubInfo = subList.stream() currentSubInfo = subList.stream()
.filter(SubscriptionAnnotation::isDisplayAllowed) .filter(SubscriptionAnnotation::isDisplayAllowed)
.filter(SubscriptionAnnotation::isActive)
.findFirst().orElse(null); .findFirst().orElse(null);
} }
return (currentSubInfo == null) ? null : currentSubInfo.getSubInfo(); return (currentSubInfo == null) ? null : currentSubInfo.getSubInfo();