commit | a203f11bee5a1f32cff574a12ad3ef101a2759f3 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 24 06:24:16 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 24 06:24:16 2022 +0000 |
tree | f2731a464a5e7e4190c1a39b6f3a0314bb1a1e59 | |
parent | 2eae4ac4deecaed619a3dbad2a3f6446bbd9cc12 [diff] | |
parent | b070ddda1739766d8b018d9788c25b05f89f80b1 [diff] |
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235 Change-Id: Idc9414ef3b35e40d4622cb5968251ab200a59430 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml index d130991..2b5b7de 100644 --- a/res/values-ml/arrays.xml +++ b/res/values-ml/arrays.xml
@@ -527,7 +527,7 @@ </string-array> <string-array name="cdma_system_select_choices"> <item msgid="1205665684426617345">"ഹോം മാത്രം"</item> - <item msgid="6691772120712000966">"സ്വയമേവ"</item> + <item msgid="6691772120712000966">"സ്വമേധയാ"</item> </string-array> <string-array name="preferred_network_mode_choices"> <item msgid="5746729990546256950">"മുൻഗണന നൽകുന്നത് GSM/WCDMA"</item>
diff --git a/src/com/android/settings/network/telephony/RoamingDialogFragment.java b/src/com/android/settings/network/telephony/RoamingDialogFragment.java index bd45226..3e9875e 100644 --- a/src/com/android/settings/network/telephony/RoamingDialogFragment.java +++ b/src/com/android/settings/network/telephony/RoamingDialogFragment.java
@@ -72,7 +72,9 @@ .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