Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make GlobalActionsDialogLite directly injectable"

Browse Source
This commit is contained in:
Dave Mankoff
2022-04-06 17:27:04 +00:00
committed by Gerrit Code Review
parent d690893b54 c666c5e761
commit 5b0a11e976
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java
View File

@@ -41,26 +41,23 @@ import com.android.systemui.statusbar.policy.KeyguardStateController;
import javax.inject.Inject; import javax.inject.Inject;
import dagger.Lazy;
public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks { public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks {
private final Context mContext; private final Context mContext;
private final Lazy<GlobalActionsDialogLite> mGlobalActionsDialogLazy;
private final KeyguardStateController mKeyguardStateController; private final KeyguardStateController mKeyguardStateController;
private final DeviceProvisionedController mDeviceProvisionedController; private final DeviceProvisionedController mDeviceProvisionedController;
private final BlurUtils mBlurUtils; private final BlurUtils mBlurUtils;
private final CommandQueue mCommandQueue; private final CommandQueue mCommandQueue;
private GlobalActionsDialogLite mGlobalActionsDialog; private final GlobalActionsDialogLite mGlobalActionsDialog;
private boolean mDisabled; private boolean mDisabled;
@Inject @Inject
public GlobalActionsImpl(Context context, CommandQueue commandQueue, public GlobalActionsImpl(Context context, CommandQueue commandQueue,
Lazy<GlobalActionsDialogLite> globalActionsDialogLazy, BlurUtils blurUtils, GlobalActionsDialogLite globalActionsDialog, BlurUtils blurUtils,
KeyguardStateController keyguardStateController, KeyguardStateController keyguardStateController,
DeviceProvisionedController deviceProvisionedController) { DeviceProvisionedController deviceProvisionedController) {
mContext = context; mContext = context;
mGlobalActionsDialogLazy = globalActionsDialogLazy; mGlobalActionsDialog = globalActionsDialog;
mKeyguardStateController = keyguardStateController; mKeyguardStateController = keyguardStateController;
mDeviceProvisionedController = deviceProvisionedController; mDeviceProvisionedController = deviceProvisionedController;
mCommandQueue = commandQueue; mCommandQueue = commandQueue;
@@ -71,16 +68,12 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks
@Override @Override
public void destroy() { public void destroy() {
mCommandQueue.removeCallback(this); mCommandQueue.removeCallback(this);
if (mGlobalActionsDialog != null) { mGlobalActionsDialog.destroy();
mGlobalActionsDialog.destroy();
mGlobalActionsDialog = null;
}
} }
@Override @Override
public void showGlobalActions(GlobalActionsManager manager) { public void showGlobalActions(GlobalActionsManager manager) {
if (mDisabled) return; if (mDisabled) return;
mGlobalActionsDialog = mGlobalActionsDialogLazy.get();
mGlobalActionsDialog.showOrHideDialog(mKeyguardStateController.isShowing(), mGlobalActionsDialog.showOrHideDialog(mKeyguardStateController.isShowing(),
mDeviceProvisionedController.isDeviceProvisioned(), null /* view */); mDeviceProvisionedController.isDeviceProvisioned(), null /* view */);
} }
@@ -189,7 +182,7 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks
final boolean disabled = (state2 & DISABLE2_GLOBAL_ACTIONS) != 0; final boolean disabled = (state2 & DISABLE2_GLOBAL_ACTIONS) != 0;
if (displayId != mContext.getDisplayId() || disabled == mDisabled) return; if (displayId != mContext.getDisplayId() || disabled == mDisabled) return;
mDisabled = disabled; mDisabled = disabled;
if (disabled && mGlobalActionsDialog != null) { if (disabled) {
mGlobalActionsDialog.dismissDialog(); mGlobalActionsDialog.dismissDialog();
} }
} }