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

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

Merge "Initialize GlobalActionsPanelPlugin before GlobalActions is launched"

parents 5678571d a3f52079

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

+7 −12
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ import com.android.systemui.plugins.GlobalActions.GlobalActionsManager; 
import com.android.systemui.plugins.GlobalActionsPanelPlugin;

import com.android.systemui.statusbar.phone.ScrimController;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.ExtensionController;

import com.android.systemui.statusbar.policy.ExtensionController.Extension;

import com.android.systemui.util.EmergencyDialerConstants;

import com.android.systemui.util.leak.RotationUtils;

import com.android.systemui.volume.SystemUIInterpolators.LogAccelerateInterpolator;
@@ -161,9 +159,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
    private final EmergencyAffordanceManager mEmergencyAffordanceManager;

    private final ScreenshotHelper mScreenshotHelper;

    private final ScreenRecordHelper mScreenRecordHelper;



    private final Extension<GlobalActionsPanelPlugin> mPanelExtension;

    private ActivityStarter mActivityStarter;

    private final ActivityStarter mActivityStarter;

    private GlobalActionsPanelPlugin mPanelPlugin;



    /**

     * @param context everything needs a context :(
@@ -209,10 +206,6 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 


        Dependency.get(ConfigurationController.class).addCallback(this);



        mPanelExtension = Dependency.get(ExtensionController.class)

            .newExtension(GlobalActionsPanelPlugin.class)

            .withPlugin(GlobalActionsPanelPlugin.class)

            .build();

        mActivityStarter = Dependency.get(ActivityStarter.class);

    }
@@ -221,9 +214,11 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
     *

     * @param keyguardShowing True if keyguard is showing

     */

    public void showDialog(boolean keyguardShowing, boolean isDeviceProvisioned) {

    public void showDialog(boolean keyguardShowing, boolean isDeviceProvisioned,

            GlobalActionsPanelPlugin panelPlugin) {

        mKeyguardShowing = keyguardShowing;

        mDeviceProvisioned = isDeviceProvisioned;

        mPanelPlugin = panelPlugin;

        if (mDialog != null) {

            mDialog.dismiss();

            mDialog = null;
@@ -400,8 +395,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
        mAdapter = new MyAdapter();



        GlobalActionsPanelPlugin.PanelViewController panelViewController =

                mPanelExtension.get() != null

                        ? mPanelExtension.get().onPanelShown(

                mPanelPlugin != null

                        ? mPanelPlugin.onPanelShown(

                                new GlobalActionsPanelPlugin.Callbacks() {

                                    @Override

                                    public void dismissGlobalActionsMenu() {

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

+9 −1
Original line number Diff line number Diff line
@@ -37,8 +37,10 @@ import com.android.systemui.Dependency; 
import com.android.systemui.SysUiServiceProvider;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.plugins.GlobalActions;

import com.android.systemui.plugins.GlobalActionsPanelPlugin;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.statusbar.policy.ExtensionController;

import com.android.systemui.statusbar.policy.KeyguardMonitor;



public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks {
@@ -48,6 +50,7 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks 
    private final Context mContext;

    private final KeyguardMonitor mKeyguardMonitor;

    private final DeviceProvisionedController mDeviceProvisionedController;

    private final ExtensionController.Extension<GlobalActionsPanelPlugin> mPanelExtension;

    private GlobalActionsDialog mGlobalActions;

    private boolean mDisabled;
@@ -56,6 +59,10 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks 
        mKeyguardMonitor = Dependency.get(KeyguardMonitor.class);

        mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class);

        SysUiServiceProvider.getComponent(context, CommandQueue.class).addCallback(this);

        mPanelExtension = Dependency.get(ExtensionController.class)

                .newExtension(GlobalActionsPanelPlugin.class)

                .withPlugin(GlobalActionsPanelPlugin.class)

                .build();

    }



    @Override
@@ -74,7 +81,8 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks 
            mGlobalActions = new GlobalActionsDialog(mContext, manager);

        }

        mGlobalActions.showDialog(mKeyguardMonitor.isShowing(),

                mDeviceProvisionedController.isDeviceProvisioned());

                mDeviceProvisionedController.isDeviceProvisioned(),

                mPanelExtension.get());

    }



    @Override