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

Commit 68b5a35c authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge changes from topic "commandQueue" 

* changes:
  Introduce AutoHideController to centralize call to WMS (4/N)
  Make Some APIs in CommandQueue aware of multi-display (3/N)
parents dba48da1 8c9a83fe

core/java/android/app/StatusBarManager.java

+31 −0
Original line number Diff line number Diff line
@@ -69,6 +69,22 @@ public class StatusBarManager { 
            | DISABLE_SYSTEM_INFO | DISABLE_RECENT | DISABLE_HOME | DISABLE_BACK | DISABLE_CLOCK

            | DISABLE_SEARCH;



    @IntDef(flag = true, prefix = {"DISABLE_"}, value = {

            DISABLE_NONE,

            DISABLE_EXPAND,

            DISABLE_NOTIFICATION_ICONS,

            DISABLE_NOTIFICATION_ALERTS,

            DISABLE_NOTIFICATION_TICKER,

            DISABLE_SYSTEM_INFO,

            DISABLE_HOME,

            DISABLE_RECENT,

            DISABLE_BACK,

            DISABLE_CLOCK,

            DISABLE_SEARCH

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface DisableFlags {}



    /**

     * Flag to disable quick settings.

     *
@@ -104,10 +120,25 @@ public class StatusBarManager { 
    public static final int WINDOW_STATUS_BAR = 1;

    public static final int WINDOW_NAVIGATION_BAR = 2;



    @IntDef(flag = true, prefix = { "WINDOW_" }, value = {

        WINDOW_STATUS_BAR,

        WINDOW_NAVIGATION_BAR

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface WindowType {}



    public static final int WINDOW_STATE_SHOWING = 0;

    public static final int WINDOW_STATE_HIDING = 1;

    public static final int WINDOW_STATE_HIDDEN = 2;



    @IntDef(flag = true, prefix = { "WINDOW_STATE_" }, value = {

            WINDOW_STATE_SHOWING,

            WINDOW_STATE_HIDING,

            WINDOW_STATE_HIDDEN

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface WindowVisibleState {}



    public static final int CAMERA_LAUNCH_SOURCE_WIGGLE = 0;

    public static final int CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP = 1;

    public static final int CAMERA_LAUNCH_SOURCE_LIFT_TRIGGER = 2;

packages/SystemUI/src/com/android/systemui/Dependency.java

+8 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import com.android.systemui.statusbar.notification.VisualStabilityManager; 
import com.android.systemui.statusbar.notification.logging.NotificationLogger;

import com.android.systemui.statusbar.notification.row.NotificationBlockingHelperManager;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

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

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

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

import com.android.systemui.statusbar.phone.LockscreenGestureLogger;
@@ -270,6 +271,7 @@ public class Dependency extends SystemUI { 
    @Inject

    Lazy<NotificationAlertingManager> mNotificationAlertingManager;

    @Inject Lazy<SensorPrivacyManager> mSensorPrivacyManager;

    @Inject Lazy<AutoHideController> mAutoHideController;

    @Inject @Named(BG_LOOPER_NAME) Lazy<Looper> mBgLooper;

    @Inject @Named(BG_HANDLER_NAME) Lazy<Handler> mBgHandler;

    @Inject @Named(MAIN_HANDLER_NAME) Lazy<Handler> mMainHandler;
@@ -443,6 +445,12 @@ public class Dependency extends SystemUI { 
        mProviders.put(NotificationEntryManager.class, mNotificationEntryManager::get);

        mProviders.put(NotificationAlertingManager.class, mNotificationAlertingManager::get);



        // TODO(b/118592525): to support multi-display , we start to add something which is

        //                    per-display, while others may be global. I think it's time to add

        //                    a new class maybe named DisplayDependency to solve per-display

        //                    Dependency problem.

        mProviders.put(AutoHideController.class, mAutoHideController::get);



        sDependency = this;

    }

packages/SystemUI/src/com/android/systemui/DependencyProvider.java

+8 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.systemui.plugins.PluginInitializerImpl; 
import com.android.systemui.shared.plugins.PluginManager;

import com.android.systemui.shared.plugins.PluginManagerImpl;

import com.android.systemui.statusbar.NavigationBarController;

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

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

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

import com.android.systemui.statusbar.phone.StatusBar;
@@ -181,4 +182,11 @@ public class DependencyProvider { 
    public ConfigurationController provideConfigurationController(Context context) {

        return new ConfigurationControllerImpl(context);

    }



    @Singleton

    @Provides

    public AutoHideController provideAutoHideController(Context context,

            @Named(MAIN_HANDLER_NAME) Handler mainHandler) {

        return new AutoHideController(context, mainHandler);

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -132,9 +132,9 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks 
    }



    @Override

    public void disable(int state1, int state2, boolean animate) {

    public void disable(int displayId, int state1, int state2, boolean animate) {

        final boolean disabled = (state2 & DISABLE2_GLOBAL_ACTIONS) != 0;

        if (disabled == mDisabled) return;

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

        mDisabled = disabled;

        if (disabled && mGlobalActions != null) {

            mGlobalActions.dismissDialog();

packages/SystemUI/src/com/android/systemui/qs/QSFragment.java

+4 −1
Original line number Diff line number Diff line
@@ -215,7 +215,10 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
    }



    @Override

    public void disable(int state1, int state2, boolean animate) {

    public void disable(int displayId, int state1, int state2, boolean animate) {

        if (displayId != getContext().getDisplayId()) {

            return;

        }

        state2 = mRemoteInputQuickSettingsDisabler.adjustDisableFlags(state2);



        final boolean disabled = (state2 & DISABLE2_QUICK_SETTINGS) != 0;