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

Tweak the layout for Pattern/PIN/Password enrollment

Browse Source 
- Fix the problem with invisible title
- Fix the wrong layout for landscape mode
- Apply color extraction

Fix: 185076320
Fix: 182339941
Fix: 182440016
Fix: 184715547
Fix: 183710293
Test: robotests and visual verified
Change-Id: Ib8e2a015bc52fcac2d285777972177e53bde7489
This commit is contained in:
Mill Chen
2021-05-15 05:03:19 +08:00
parent 0c28e9dca7
commit 9edcc5b5e3
7 changed files with 54 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -33,10 +33,8 @@ import android.util.Pair;
import android.util.TypedValue;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Surface;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ScrollView;
import android.widget.TextView;
import androidx.fragment.app.Fragment;
@@ -61,6 +59,8 @@ import com.google.android.collect.Lists;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupdesign.GlifLayout;
import com.google.android.setupdesign.template.IconMixin;
import com.google.android.setupdesign.util.ThemeHelper;
import java.util.Collections;
import java.util.List;
@@ -94,12 +94,6 @@ public class ChooseLockPattern extends SettingsActivity {
return modIntent;
}
@Override
protected void onApplyThemeResource(Theme theme, int resid, boolean first) {
final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
super.onApplyThemeResource(theme, new_resid, first);
}
public static class IntentBuilder {
private final Intent mIntent;
@@ -171,7 +165,8 @@ public class ChooseLockPattern extends SettingsActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
// requestWindowFeature(Window.FEATURE_NO_TITLE);
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
ThemeHelper.trySetDynamicColor(this);
super.onCreate(savedInstanceState);
findViewById(R.id.content_parent).setFitsSystemWindows(false);
}
@@ -205,9 +200,7 @@ public class ChooseLockPattern extends SettingsActivity {
private LockscreenCredential mCurrentCredential;
private boolean mRequestGatekeeperPassword;
protected TextView mTitleText;
protected TextView mHeaderText;
protected TextView mMessageText;
protected LockPatternView mLockPatternView;
protected TextView mFooterText;
protected FooterButton mSkipOrClearButton;
@@ -215,9 +208,6 @@ public class ChooseLockPattern extends SettingsActivity {
@VisibleForTesting protected LockscreenCredential mChosenPattern;
private ColorStateList mDefaultHeaderColorList;
// ScrollView that contains title and header, only exist in land mode
private ScrollView mTitleHeaderScrollView;
/**
* The patten used during the help screen to show how to draw a pattern.
*/
@@ -308,15 +298,6 @@ public class ChooseLockPattern extends SettingsActivity {
}
mFooterText.setText("");
mNextButton.setEnabled(false);
if (mTitleHeaderScrollView != null) {
mTitleHeaderScrollView.post(new Runnable() {
@Override
public void run() {
mTitleHeaderScrollView.fullScroll(ScrollView.FOCUS_DOWN);
}
});
}
}
};
@@ -513,17 +494,12 @@ public class ChooseLockPattern extends SettingsActivity {
Bundle savedInstanceState) {
final GlifLayout layout = (GlifLayout) inflater.inflate(
R.layout.choose_lock_pattern, container, false);
switch(getContext().getDisplay().getRotation()) {
case Surface.ROTATION_90:
case Surface.ROTATION_270:
layout.setLandscapeHeaderAreaVisible(false /* visible */);
break;
}
updateActivityTitle();
layout.setHeaderText(getActivity().getTitle());
if (getResources().getBoolean(R.bool.config_lock_pattern_minimal_ui)) {
View iconView = layout.findViewById(R.id.sud_layout_icon);
if (iconView != null) {
iconView.setVisibility(View.GONE);
layout.getMixin(IconMixin.class).setVisibility(View.GONE);
}
} else {
if (mForFingerprint) {
@@ -561,10 +537,8 @@ public class ChooseLockPattern extends SettingsActivity {
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
mTitleText = view.findViewById(R.id.suc_layout_title);
mHeaderText = (TextView) view.findViewById(R.id.headerText);
mDefaultHeaderColorList = mHeaderText.getTextColors();
mMessageText = view.findViewById(R.id.sud_layout_description);
mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
mLockPatternView.setOnPatternListener(mChooseNewLockPatternListener);
mLockPatternView.setTactileFeedbackEnabled(
@@ -573,9 +547,6 @@ public class ChooseLockPattern extends SettingsActivity {
mFooterText = (TextView) view.findViewById(R.id.footerText);
mTitleHeaderScrollView = (ScrollView) view.findViewById(R.id
.scroll_layout_title_header);
// make it so unhandled touch events within the unlock screen go to the
// lock pattern view.
final LinearLayoutWithDefaultTouchRecepient topLayout
@@ -756,12 +727,13 @@ public class ChooseLockPattern extends SettingsActivity {
} else {
mHeaderText.setText(stage.headerMessage);
}
final GlifLayout layout = getActivity().findViewById(R.id.setup_wizard_layout);
final boolean forAnyBiometric = mForFingerprint || mForFace || mForBiometrics;
int message = forAnyBiometric ? stage.messageForBiometrics : stage.message;
if (message == ID_EMPTY_MESSAGE) {
mMessageText.setText("");
layout.setDescriptionText("");
} else {
mMessageText.setText(message);
layout.setDescriptionText(message);
}
if (stage.footerMessage == ID_EMPTY_MESSAGE) {
mFooterText.setText("");
@@ -782,7 +754,7 @@ public class ChooseLockPattern extends SettingsActivity {
if (stage == Stage.NeedToConfirm && forAnyBiometric) {
mHeaderText.setText("");
mTitleText.setText(R.string.lockpassword_draw_your_pattern_again_header);
layout.setHeaderText(R.string.lockpassword_draw_your_pattern_again_header);
}
}