From aea3e0b205304e3c551a53f17e5767d734889e13 Mon Sep 17 00:00:00 2001 From: pastychang Date: Fri, 4 May 2018 11:01:24 +0800 Subject: [PATCH] Show Option of "Screen lock options" on SUW pattern screen page Add more check for stages of Patern input. Make sure that button "Screen lock options" is visiable. Test: atest SetupChooseLockPatternTest Bug: 76431549 Change-Id: Iec7d0eb4a3c16ebd2a504fbbc6de465c341ca43a --- .../android/settings/password/SetupChooseLockPattern.java | 4 +++- .../settings/password/SetupChooseLockPatternTest.java | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java index 0b272f5b938..4d4119f8fd3 100644 --- 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); } } diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java index e38cc6af7cc..26bb17b2c5c 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java @@ -92,13 +92,16 @@ public class SetupChooseLockPatternTest { } @Test - public void selectPattern_shouldHideOptionsButton() { + public void optionsButton_whenPatternSelected_shouldBeVisible() { Button button = mActivity.findViewById(R.id.screen_lock_options); assertThat(button).isNotNull(); assertThat(button.getVisibility()).isEqualTo(View.VISIBLE); LockPatternView lockPatternView = mActivity.findViewById(R.id.lockPattern); ReflectionHelpers.callInstanceMethod(lockPatternView, "notifyPatternDetected"); + + enterPattern(); + assertThat(button.getVisibility()).isEqualTo(View.VISIBLE); } private void verifyScreenLockOptionsShown() {