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

Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"

Browse Source 
This reverts commit eba8857094.

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

Bug: 185553806
Change-Id: Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9
This commit is contained in:
Peter Wang
2021-07-01 05:11:41 +00:00
parent eba8857094
commit 494c68e3cf
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
View File

@@ -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() {