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

Commit bfeee279 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev am: 4d6375e0

am: baab6519

Change-Id: I9a024644f81a62bd5cfce912e96bb37320cdab31
parents 1ac49673 baab6519
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -3390,6 +3390,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