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

Merge "Fix the SUW setup Pattern view the two steps offset issue" into main

Browse Source
This commit is contained in:
Bill Lin
2025-01-21 23:12:37 -08:00
committed by Android (Google) Code Review
parent 047c38856a 5b70748ce9
commit e34c3f9b99
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/password/SetupChooseLockPattern.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.password; package com.android.settings.password;
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_PATTERN; import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_PATTERN;
import android.content.Context; import android.content.Context;
@@ -138,17 +136,10 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
protected void updateStage(Stage stage) { protected void updateStage(Stage stage) {
super.updateStage(stage); super.updateStage(stage);
if (!showMinimalUi() && mOptionsButton != null) { if (!showMinimalUi() && mOptionsButton != null) {
// In landscape, keep view stub to avoid pattern view shifting, but in portrait the
// header title and description could become multiple lines in confirm stage,
// gone the button view to reserve more room for growth height of header.
@View.Visibility
final int hideOrGone =
getResources().getConfiguration().orientation == ORIENTATION_LANDSCAPE
? View.INVISIBLE : View.GONE;
mOptionsButton.setVisibility( mOptionsButton.setVisibility(
(stage == Stage.Introduction || stage == Stage.HelpScreen || (stage == Stage.Introduction || stage == Stage.HelpScreen ||
stage == Stage.ChoiceTooShort || stage == Stage.FirstChoiceValid) stage == Stage.ChoiceTooShort || stage == Stage.FirstChoiceValid)
? View.VISIBLE : hideOrGone); ? View.VISIBLE : View.INVISIBLE);
} }
if (stage.leftMode == LeftButtonMode.Gone && stage == Stage.Introduction) { if (stage.leftMode == LeftButtonMode.Gone && stage == Stage.Introduction) {