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

Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment

Browse Source 
1. Use GlifLayout#setDescriptionText to align UX.
2. Remove redundant layout resources.
3. Add two new robotests.

Bug: 236948821
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SetupChooseLockGenericTest
Test: Check UI manually
Change-Id: I85cc984527fcc746e835d8fa508e78c96dfdcb94
This commit is contained in:
Ahan Wu
2023-03-15 15:54:16 +00:00
parent 7626600bbf
commit ae84ac3530
4 changed files with 58 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/password/SetupChooseLockGeneric.java
View File

@@ -109,6 +109,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
super.onViewCreated(view, savedInstanceState);
GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
layout.setDescriptionText(loadDescriptionText());
layout.setDividerItemDecoration(new SettingsDividerItemDecoration(getContext()));
layout.setDividerInset(getContext().getResources().getDimensionPixelSize(
R.dimen.sud_items_glif_text_divider_inset));
@@ -129,11 +130,9 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
@Override
protected void addHeaderView() {
if (isForBiometric()) {
setHeaderView(R.layout.setup_choose_lock_generic_biometrics_header);
} else {
setHeaderView(R.layout.setup_choose_lock_generic_header);
}
// The original logic has been moved to onViewCreated and
// uses GlifLayout#setDescriptionText instead,
// keep empty body here since we won't call super method.
}
@Override
@@ -239,6 +238,12 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
private boolean isForBiometric() {
return mForFingerprint || mForFace || mForBiometrics;
}
String loadDescriptionText() {
return getString(isForBiometric()
? R.string.lock_settings_picker_biometrics_added_security_message
: R.string.setup_lock_settings_picker_message);
}
}
public static class InternalActivity extends ChooseLockGeneric.InternalActivity {