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

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

Browse Source
This commit is contained in:
SongFerng Wang
2022-03-25 15:34:32 +00:00
committed by Gerrit Code Review
parent d71406f8ee 0f77d567b4
commit 02db0438a9
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -12779,8 +12779,6 @@
<string name="sim_action_reboot">Restart</string> <string name="sim_action_reboot">Restart</string>
<!-- Button on a dialog to reject SIM operations. [CHAR LIMIT=30] --> <!-- Button on a dialog to reject SIM operations. [CHAR LIMIT=30] -->
<string name="sim_action_no_thanks">No thanks</string> <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] --> <!-- 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> <string name="sim_switch_button">Switch</string>
<!-- Title of DSDS activation failure dialog [CHAR LIMIT=40] --> <!-- Title of DSDS activation failure dialog [CHAR LIMIT=40] -->

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_restart_title),
getString(R.string.sim_action_enable_dsds_text), getString(R.string.sim_action_enable_dsds_text),
getString(R.string.sim_action_reboot), getString(R.string.sim_action_reboot),
getString(R.string.sim_action_cancel)); getString(R.string.cancel));
} }
/* Displays the SIM toggling confirmation dialog. */ /* Displays the SIM toggling confirmation dialog. */
@@ -359,7 +359,7 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
title, title,
null, null,
getString(R.string.yes), getString(R.string.yes),
getString(R.string.sim_action_cancel)); getString(R.string.cancel));
} }
private void showEnableSimConfirmDialog() { private void showEnableSimConfirmDialog() {
@@ -384,7 +384,7 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
getSwitchSubscriptionTitle(), getSwitchSubscriptionTitle(),
getSwitchDialogBodyMsg(activeSub, isBetweenEsim), getSwitchDialogBodyMsg(activeSub, isBetweenEsim),
getSwitchDialogPosBtnText(), getSwitchDialogPosBtnText(),
getString(R.string.sim_action_cancel)); getString(android.R.string.cancel));
} }
private void showNonSwitchSimConfirmDialog() { private void showNonSwitchSimConfirmDialog() {
@@ -395,7 +395,7 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
getEnableSubscriptionTitle(), getEnableSubscriptionTitle(),
null /* msg */, null /* msg */,
getString(R.string.yes), getString(R.string.yes),
getString(R.string.sim_action_cancel)); getString(android.R.string.cancel));
} }
private String getSwitchDialogPosBtnText() { private String getSwitchDialogPosBtnText() {