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

Commit c9ffc840 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Provide isLocked to wallet instead of isUnlocked" into rvc-dev

parents a4b94746 ae760073

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;