From e4be25444b7658000241b4ade3d6aca8de36ebbd Mon Sep 17 00:00:00 2001 From: Beth Thibodeau Date: Tue, 13 Apr 2021 20:06:26 -0400 Subject: [PATCH] Open power menu lite on long press power Bug: 179674461 Test: manual Change-Id: Ia5cac8d51aee1d519be1528c9ba7991b5d69e5df --- .../globalactions/GlobalActionsImpl.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java index ce5795ccd3395..767d7ab5a4902 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java @@ -35,12 +35,10 @@ import com.android.keyguard.KeyguardUpdateMonitor; import com.android.settingslib.Utils; import com.android.systemui.Dependency; import com.android.systemui.plugins.GlobalActions; -import com.android.systemui.plugins.GlobalActionsPanelPlugin; import com.android.systemui.statusbar.BlurUtils; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.statusbar.policy.DeviceProvisionedController; -import com.android.systemui.statusbar.policy.ExtensionController; import com.android.systemui.statusbar.policy.KeyguardStateController; import javax.inject.Inject; @@ -50,18 +48,17 @@ import dagger.Lazy; public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks { private final Context mContext; - private final Lazy mGlobalActionsDialogLazy; + private final Lazy mGlobalActionsDialogLazy; private final KeyguardStateController mKeyguardStateController; private final DeviceProvisionedController mDeviceProvisionedController; - private final ExtensionController.Extension mWalletPluginProvider; private final BlurUtils mBlurUtils; private final CommandQueue mCommandQueue; - private GlobalActionsDialog mGlobalActionsDialog; + private GlobalActionsDialogLite mGlobalActionsDialog; private boolean mDisabled; @Inject public GlobalActionsImpl(Context context, CommandQueue commandQueue, - Lazy globalActionsDialogLazy, BlurUtils blurUtils) { + Lazy globalActionsDialogLazy, BlurUtils blurUtils) { mContext = context; mGlobalActionsDialogLazy = globalActionsDialogLazy; mKeyguardStateController = Dependency.get(KeyguardStateController.class); @@ -69,10 +66,6 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks mCommandQueue = commandQueue; mBlurUtils = blurUtils; mCommandQueue.addCallback(this); - mWalletPluginProvider = Dependency.get(ExtensionController.class) - .newExtension(GlobalActionsPanelPlugin.class) - .withPlugin(GlobalActionsPanelPlugin.class) - .build(); } @Override @@ -89,8 +82,7 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks if (mDisabled) return; mGlobalActionsDialog = mGlobalActionsDialogLazy.get(); mGlobalActionsDialog.showOrHideDialog(mKeyguardStateController.isShowing(), - mDeviceProvisionedController.isDeviceProvisioned(), - mWalletPluginProvider.get()); + mDeviceProvisionedController.isDeviceProvisioned()); Dependency.get(KeyguardUpdateMonitor.class).requestFaceAuth(); }