From 5b70748ce95e8df9cefe95173ecf97d6bc1c5070 Mon Sep 17 00:00:00 2001 From: lbill Date: Mon, 26 Feb 2024 07:32:13 +0000 Subject: [PATCH] Fix the SUW setup Pattern view the two steps offset issue Test: manual go through SUW setup Pattern view, and make sure pattern view do not shift in confirm step Fixes: 324489595 Flag: EXEMPT bugfix/clean up layout issue Change-Id: Ia5e6ef8a8c9ecf712f69bfde2bb631dc2605210d --- .../settings/password/SetupChooseLockPattern.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/com/android/settings/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java index 55b3847125e..794104912e8 100644 --- a/src/com/android/settings/password/SetupChooseLockPattern.java +++ b/src/com/android/settings/password/SetupChooseLockPattern.java @@ -16,8 +16,6 @@ package com.android.settings.password; -import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; - import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_PATTERN; import android.content.Context; @@ -138,17 +136,10 @@ public class SetupChooseLockPattern extends ChooseLockPattern { protected void updateStage(Stage stage) { super.updateStage(stage); 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( (stage == Stage.Introduction || stage == Stage.HelpScreen || stage == Stage.ChoiceTooShort || stage == Stage.FirstChoiceValid) - ? View.VISIBLE : hideOrGone); + ? View.VISIBLE : View.INVISIBLE); } if (stage.leftMode == LeftButtonMode.Gone && stage == Stage.Introduction) {