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

Commit d456b065 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Controls UI - Only show controls after device is setup" into rvc-dev... 

Merge "Controls UI - Only show controls after device is setup" into rvc-dev am: fb3ee920 am: 89cd6b43

Change-Id: I9993878b9b1d57dab163ce66bcddc323c35fc9dc
parents 1fd0572b 89cd6b43

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

+2 −1
Original line number Diff line number Diff line
@@ -2382,7 +2382,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
                || mKeyguardStateController.canDismissLockScreen();

        return (isUnlocked || mShowLockScreenCardsAndControls)

                && mControlsUiController.getAvailable()

                && !mControlsServiceInfos.isEmpty();

                && !mControlsServiceInfos.isEmpty()

                && mDeviceProvisioned;

    }

    // TODO: Remove legacy layout XML and classes.

    protected boolean shouldUseControlsLayout() {