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

Commit 930a7d37 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "Make GlobalActionsDialogLite directly injectable" am: 5b0a11e9 am:... 

Merge "Make GlobalActionsDialogLite directly injectable" am: 5b0a11e9 am: 02b24e76 am: 501fecf9 am: 16899045

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914693



Change-Id: Ib13323a42a9cd42fd5d81190e97a53a0cbff8536
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea7d8255 16899045

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

+5 −12
Original line number Diff line number Diff line
@@ -41,26 +41,23 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; 


import javax.inject.Inject;



import dagger.Lazy;



public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks {



    private final Context mContext;

    private final Lazy<GlobalActionsDialogLite> mGlobalActionsDialogLazy;

    private final KeyguardStateController mKeyguardStateController;

    private final DeviceProvisionedController mDeviceProvisionedController;

    private final BlurUtils mBlurUtils;

    private final CommandQueue mCommandQueue;

    private GlobalActionsDialogLite mGlobalActionsDialog;

    private final GlobalActionsDialogLite mGlobalActionsDialog;

    private boolean mDisabled;



    @Inject

    public GlobalActionsImpl(Context context, CommandQueue commandQueue,

            Lazy<GlobalActionsDialogLite> globalActionsDialogLazy, BlurUtils blurUtils,

            GlobalActionsDialogLite globalActionsDialog, BlurUtils blurUtils,

            KeyguardStateController keyguardStateController,

            DeviceProvisionedController deviceProvisionedController) {

        mContext = context;

        mGlobalActionsDialogLazy = globalActionsDialogLazy;

        mGlobalActionsDialog = globalActionsDialog;

        mKeyguardStateController = keyguardStateController;

        mDeviceProvisionedController = deviceProvisionedController;

        mCommandQueue = commandQueue;
@@ -71,16 +68,12 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks 
    @Override

    public void destroy() {

        mCommandQueue.removeCallback(this);

        if (mGlobalActionsDialog != null) {

        mGlobalActionsDialog.destroy();

            mGlobalActionsDialog = null;

        }

    }



    @Override

    public void showGlobalActions(GlobalActionsManager manager) {

        if (mDisabled) return;

        mGlobalActionsDialog = mGlobalActionsDialogLazy.get();

        mGlobalActionsDialog.showOrHideDialog(mKeyguardStateController.isShowing(),

                mDeviceProvisionedController.isDeviceProvisioned(), null /* view */);

    }
@@ -189,7 +182,7 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks 
        final boolean disabled = (state2 & DISABLE2_GLOBAL_ACTIONS) != 0;

        if (displayId != mContext.getDisplayId() || disabled == mDisabled) return;

        mDisabled = disabled;

        if (disabled && mGlobalActionsDialog != null) {

        if (disabled) {

            mGlobalActionsDialog.dismissDialog();

        }

    }