From 494c68e3cf0a214b7b3fdcfbaba9a91b2be8abf9 Mon Sep 17 00:00:00 2001
From: Peter Wang <tpwang@google.com>
Date: Thu, 1 Jul 2021 05:11:41 +0000
Subject: [PATCH] Revert "Add a cancel string for ToggleSubscriptionDialog to
 handle Tamil"

This reverts commit eba8857094c0a1deabaedba92f9713fddb7b0781.

Reason for revert: Issue not urgent enough to go in S, will resubmit to master

Bug: 185553806
Change-Id: Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9
---
 res/values/strings.xml                                    | 2 --
 .../telephony/ToggleSubscriptionDialogActivity.java       | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0f98a5a3e23..aeaea6116b8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12892,8 +12892,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] -->
diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
index e67ac42af47..0064e6ccfd2 100644
--- a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
+++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
@@ -338,7 +338,7 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
                 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 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
                 title,
                 null,
                 getString(R.string.yes),
-                getString(R.string.sim_action_cancel));
+                getString(R.string.cancel));
     }
 
     private void showEnableSimConfirmDialog() {
@@ -384,7 +384,7 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
                 getSwitchSubscriptionTitle(),
                 getSwitchDialogBodyMsg(activeSub, isBetweenEsim),
                 getSwitchDialogPosBtnText(),
-                getString(R.string.sim_action_cancel));
+                getString(android.R.string.cancel));
     }
 
     private void showNonSwitchSimConfirmDialog() {
@@ -395,7 +395,7 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
                 getEnableSubscriptionTitle(),
                 null /* msg */,
                 getString(R.string.yes),
-                getString(R.string.sim_action_cancel));
+                getString(android.R.string.cancel));
     }
 
     private String getSwitchDialogPosBtnText() {