From 03da62810c83c903301590d57dd62ad0efc79795 Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Mon, 13 Jun 2022 20:55:32 +0800 Subject: [PATCH 1/2] [Settings] Avoid from close dialog when touch outside. Roaming confirmation dialog might get closed when touch outside, which is easily been triggered when having a large screen. Solution: avoid from close dialog when touch outside of dialog area. Bug: 235183999 Test: local Change-Id: Ic312d80e6f04cb8f323ebc713eef4e15257de358 --- .../settings/network/telephony/RoamingDialogFragment.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/network/telephony/RoamingDialogFragment.java b/src/com/android/settings/network/telephony/RoamingDialogFragment.java index bd452267111..3e9875e9844 100644 --- a/src/com/android/settings/network/telephony/RoamingDialogFragment.java +++ b/src/com/android/settings/network/telephony/RoamingDialogFragment.java @@ -72,7 +72,9 @@ public class RoamingDialogFragment extends InstrumentedDialogFragment implements .setIconAttribute(android.R.attr.alertDialogIcon) .setPositiveButton(android.R.string.yes, this) .setNegativeButton(android.R.string.no, this); - return builder.create(); + AlertDialog dialog = builder.create(); + dialog.setCanceledOnTouchOutside(false); + return dialog; } @Override From a1df448703dfea5dc2382aacccc6bdf493528620 Mon Sep 17 00:00:00 2001 From: Salud Lemus Date: Thu, 16 Jun 2022 12:28:19 -0700 Subject: [PATCH 2/2] Fix title used for financed device info in Settings The title for the financed device info page in Settings changes to "Managed device info" instead of "Financed device info" Bug: 236259020 Test: Manual test Change-Id: Ica6d990e8dada28b643a5523ec284c18d4af89d2 --- .../settings/enterprise/EnterprisePrivacySettings.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java index 92e4f4a5c43..a154dedfb8f 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java @@ -77,6 +77,10 @@ public class EnterprisePrivacySettings extends DashboardFragment { public void onCreate(Bundle icicle) { super.onCreate(icicle); + if (mPrivacySettingsPreference instanceof PrivacySettingsFinancedPreference) { + return; + } + replaceEnterprisePreferenceScreenTitle( MANAGED_DEVICE_INFO, R.string.enterprise_privacy_settings);