commit 5ee56fb6f8289b7282d2dc7661f90393c1d17143
author Peter Wang <tpwang@google.com> Fri Mar 25 09:47:28 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 25 09:47:28 2022 +0000
tree 126b1a25618cbaf96f7c96bce604f31d9a84dec6
parent 41ec2bc89b125962688cb0c80dc9f538054f4d09
parent 9ecda98adacbed1af8257922bfd607107c0b3769

[automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 9ecda98ada -s ours

am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043030

Change-Id: I160a5eeac58e392bb9eaabc9831354c79fca21e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ecd8301..fce8a2f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12779,8 +12779,6 @@
     <string name="sim_action_reboot">Restart</string>
     <!-- Button on a dialog to reject SIM operations. [CHAR LIMIT=30] -->
     <string name="sim_action_no_thanks">No thanks</string>
-    <!-- Button text to cancel operations proposed by a sim operation dialog [CHAR LIMIT=20] -->
-    <string name="sim_action_cancel">Cancel</string>
     <!-- Button which will disconnect the user from one mobile network and immediately connect to another. [CHAR LIMIT=30] -->
     <string name="sim_switch_button">Switch</string>
     <!-- Title of DSDS activation failure dialog [CHAR LIMIT=40] -->

src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java

diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
index 65735d9..65d8cd7 100644
--- a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
+++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
@@ -338,7 +338,7 @@
                 getString(R.string.sim_action_restart_title),
                 getString(R.string.sim_action_enable_dsds_text),
                 getString(R.string.sim_action_reboot),
-                getString(R.string.sim_action_cancel));
+                getString(R.string.cancel));
     }
 
     /* Displays the SIM toggling confirmation dialog. */
@@ -359,7 +359,7 @@
                 title,
                 null,
                 getString(R.string.yes),
-                getString(R.string.sim_action_cancel));
+                getString(R.string.cancel));
     }
 
     private void showEnableSimConfirmDialog() {
@@ -384,7 +384,7 @@
                 getSwitchSubscriptionTitle(),
                 getSwitchDialogBodyMsg(activeSub, isBetweenEsim),
                 getSwitchDialogPosBtnText(),
-                getString(R.string.sim_action_cancel));
+                getString(android.R.string.cancel));
     }
 
     private void showNonSwitchSimConfirmDialog() {
@@ -395,7 +395,7 @@
                 getEnableSubscriptionTitle(),
                 null /* msg */,
                 getString(R.string.yes),
-                getString(R.string.sim_action_cancel));
+                getString(android.R.string.cancel));
     }
 
     private String getSwitchDialogPosBtnText() {