From 0283372fc2b93d5dc529ae7b196334466256dc55 Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Wed, 25 Apr 2018 17:53:13 -0700 Subject: [PATCH] Hide cancel button in Confirm Lock Pattern Test: Manual Bug: 77790615 Bug: 77565685 Change-Id: Ic3a12d169be037376f040dd1129678e814760091 --- .../android/settings/password/ChooseLockSettingsHelper.java | 3 ++- .../settings/password/ChooseLockSettingsHelperTest.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java index cfc0ce8a6b2..4dafda6b057 100644 --- a/src/com/android/settings/password/ChooseLockSettingsHelper.java +++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java @@ -284,8 +284,9 @@ public final class ChooseLockSettingsHelper { intent.putExtra(ConfirmDeviceCredentialBaseFragment.HEADER_TEXT, header); intent.putExtra(ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT, message); intent.putExtra(ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, external); + // TODO: Remove dark theme and show_cancel_button options since they are no longer used intent.putExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, false); - intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, external); + intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false); intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, external); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, returnCredentials); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, hasChallenge); diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java index bcb154c7465..2a8c406551b 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java @@ -65,7 +65,7 @@ public class ChooseLockSettingsHelperTest { ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, false)); assertFalse(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.DARK_THEME, false)); - assertEquals(true, startedIntent.getBooleanExtra( + assertFalse(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false)); assertEquals(true, startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false)); @@ -103,7 +103,7 @@ public class ChooseLockSettingsHelperTest { ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, false)); assertFalse(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.DARK_THEME, false)); - assertEquals(false, startedIntent.getBooleanExtra( + assertFalse(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false)); assertEquals(false, startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false));