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

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

Browse Source 
am: baab651901

Change-Id: I9a024644f81a62bd5cfce912e96bb37320cdab31
This commit is contained in:
Fan Zhang
2018-05-10 17:44:42 -07:00
committed by android-build-merger
parent 1ac4967311 baab651901
commit bfeee279a8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -3390,6 +3390,8 @@
<!-- Master Clear --> <!-- Master Clear -->
<!-- Button title to factory data reset the entire device --> <!-- Button title to factory data reset the entire device -->
<string name="master_clear_title">Erase all data (factory reset)</string> <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] --> <!-- 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> <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] --> <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->

4
src/com/android/settings/MasterClear.java
View File

@@ -102,7 +102,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
@Override @Override
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(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) { private boolean runKeyguardConfirmation(int request) {
Resources res = getActivity().getResources(); Resources res = getActivity().getResources();
return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity( return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
request, res.getText(R.string.master_clear_title)); request, res.getText(R.string.master_clear_short_title));
} }
@VisibleForTesting @VisibleForTesting