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

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

@@ -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