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

Commit f6fd74b6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Provide isLocked to wallet instead of isUnlocked" into rvc-dev am: c9ffc840 am: b50a72f1 

Change-Id: I0b99793eb8d111d3c843ba8142e0e283c22473b3
parents 8ab1625e b50a72f1

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+3 −6
Original line number Diff line number Diff line
@@ -360,10 +360,9 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
            @Override

            public void onUnlockedChanged() {

                if (mDialog != null) {

                    boolean unlocked = keyguardStateController.isUnlocked()

                            || keyguardStateController.canDismissLockScreen();

                    if (mDialog.mPanelController != null) {

                        mDialog.mPanelController.onDeviceLockStateChanged(unlocked);

                        mDialog.mPanelController.onDeviceLockStateChanged(

                                !mKeyguardStateController.isUnlocked());

                    }

                    if (!mDialog.isShowingControls() && shouldShowControls()) {

                        mDialog.showControls(mControlsUiController);
@@ -2378,9 +2377,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 


    @VisibleForTesting

    protected boolean shouldShowControls() {

        boolean isUnlocked = mKeyguardStateController.isUnlocked()

                || mKeyguardStateController.canDismissLockScreen();

        return (isUnlocked || mShowLockScreenCardsAndControls)

        return (mKeyguardStateController.isUnlocked() || mShowLockScreenCardsAndControls)

                && mControlsUiController.getAvailable()

                && !mControlsServiceInfos.isEmpty()

                && mDeviceProvisioned;