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"" into sc-dev am: af63867d08 am: 96cb752b6f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167365

Change-Id: I7a1fccdb9b5e61623fa4c59c068d9613e16f0095
This commit is contained in:
TreeHugger Robot
2021-07-01 17:49:43 +00:00
committed by Automerger Merge Worker
parent 33834ab6a7 96cb752b6f
commit 62f574b502
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() {