Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd262018 authored by Maurice Lam's avatar Maurice Lam Committed by android-build-merger
Browse files

Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev am: fd452105 

am: 160ffd6c

Change-Id: Ie21d2b916927cd200eaf1195647dd983ac7594c4
parents 34b82a35 160ffd6c

src/com/android/settings/password/ChooseLockSettingsHelper.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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));