Merge "Show Option of "Screen lock options" on SUW pattern screen page"

2018-05-09 19:09:08 +00:00
parent 02ec86a17b aea3e0b205
commit 579300b00c
2 changed files with 7 additions and 2 deletions
--- a/src/com/android/settings/password/SetupChooseLockPattern.java
+++ b/src/com/android/settings/password/SetupChooseLockPattern.java
@@ -97,7 +97,9 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
            if (!getResources().getBoolean(R.bool.config_lock_pattern_minimal_ui)
                    && mOptionsButton != null) {
                mOptionsButton.setVisibility(
-                        stage == Stage.Introduction ? View.VISIBLE : View.INVISIBLE);
+                        (stage == Stage.Introduction || stage == Stage.HelpScreen ||
+                                stage == Stage.ChoiceTooShort || stage == Stage.FirstChoiceValid)
+                                ? View.VISIBLE : View.INVISIBLE);
            }
        }