Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 351c0b58 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev am: af63867d am: 18f3c51a

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

Change-Id: I0c571adb557fd13b433ecf23ffdb68be61df7fe4
parents 60fa2c0f 18f3c51a

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -12875,8 +12875,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

+4 −4
Original line number Diff line number Diff line
@@ -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() {