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

Commit 4d6375e0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev

parents ed7101cd dc00efa6
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -3386,6 +3386,8 @@
    <!-- Master Clear -->
    <!-- Button title to factory data reset the entire device -->
    <string name="master_clear_title">Erase all data (factory reset)</string>
    <!-- Button title to factory data reset the entire device. The "(factory reset)" part is optional for translation. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=3531267871084279512]-->
    <string name="master_clear_short_title">Erase all data (factory reset)</string>
    <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
    <string name="master_clear_desc" product="tablet">"This will erase all data from your tablet\u2019s <b>internal storage</b>, including:\n\n<li>Your Google account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
    <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
    @Override
    public void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        getActivity().setTitle(R.string.master_clear_title);
        getActivity().setTitle(R.string.master_clear_short_title);
    }

    /**
@@ -114,7 +114,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
    private boolean runKeyguardConfirmation(int request) {
        Resources res = getActivity().getResources();
        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
                request, res.getText(R.string.master_clear_title));
                request, res.getText(R.string.master_clear_short_title));
    }

    @VisibleForTesting