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

Commit 486abdbb authored by Avinash Vadlamudi's avatar Avinash Vadlamudi Committed by Android (Google) Code Review
Browse files

Merge "Remove the dependency on user setting to enable / disable the... 

Merge "Remove the dependency on user setting to enable / disable the lockscreen button support" into main
parents 023f2edd 79ba5298

packages/SystemUI/multivalentTests/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ public class QRCodeScannerControllerTest extends SysuiTestCase { 
        mSecureSettings.putStringForUser(LOCK_SCREEN_SHOW_QR_CODE_SCANNER, "0",

                UserHandle.USER_CURRENT);

        verifyActivityDetails("abc/.def");

        assertThat(mController.isEnabledForLockScreenButton()).isFalse();

        assertThat(mController.isEnabledForLockScreenButton()).isTrue();

        assertThat(mController.isAllowedOnLockScreen()).isTrue();

        assertThat(mController.isAbleToLaunchScannerActivity()).isTrue();

packages/SystemUI/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerController.java

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public class QRCodeScannerController implements 
     * Returns true if lock screen entry point for QR Code Scanner is to be enabled.

     */

    public boolean isEnabledForLockScreenButton() {

        return mQRCodeScannerEnabled && isAbleToLaunchScannerActivity() && isAllowedOnLockScreen();

        return isAbleToLaunchScannerActivity() && isAllowedOnLockScreen();

    }



    /** Returns whether the QR scanner button is allowed on lockscreen. */