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

Commit 8fe538b1 authored by Ats Jenk's avatar Ats Jenk Committed by Android (Google) Code Review
Browse files

Merge "Use listener to track desktop task visibility in launcher" into udc-qpr-dev

parents fc1a5273 da7e5559

quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java

+8 −1
Original line number Diff line number Diff line
@@ -61,7 +61,14 @@ public class DesktopVisibilityController { 
        mDesktopTaskListener = new IDesktopTaskListener.Stub() {

            @Override

            public void onVisibilityChanged(int displayId, boolean visible) {

                // TODO(b/261234402): move visibility from sysui state to listener

                MAIN_EXECUTOR.execute(() -> {

                    if (displayId == mLauncher.getDisplayId()) {

                        if (DEBUG) {

                            Log.d(TAG, "desktop visibility changed value=" + visible);

                        }

                        setFreeformTasksVisible(visible);

                    }

                });

            }



            @Override

quickstep/src/com/android/quickstep/TouchInteractionService.java

+0 −14
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY 
import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_UNFOLD_ANIMATION_FORWARDER;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_UNLOCK_ANIMATION_CONTROLLER;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;
@@ -88,7 +87,6 @@ import com.android.launcher3.Utilities; 
import com.android.launcher3.anim.AnimatedFloat;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.provider.RestoreDbTask;

import com.android.launcher3.statehandlers.DesktopVisibilityController;

import com.android.launcher3.statemanager.StatefulActivity;

import com.android.launcher3.taskbar.TaskbarActivityContext;

import com.android.launcher3.taskbar.TaskbarManager;
@@ -613,18 +611,6 @@ public class TouchInteractionService extends Service 
            mOverviewComponentObserver.onSystemUiStateChanged();

            mTaskbarManager.onSystemUiFlagsChanged(systemUiStateFlags);



            boolean wasFreeformActive =

                    (lastSysUIFlags & SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE) != 0;

            boolean isFreeformActive =

                    (systemUiStateFlags & SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE) != 0;

            if (wasFreeformActive != isFreeformActive) {

                DesktopVisibilityController controller =

                        LauncherActivityInterface.INSTANCE.getDesktopVisibilityController();

                if (controller != null) {

                    controller.setFreeformTasksVisible(isFreeformActive);

                }

            }



            int isShadeExpandedFlag =

                    SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED | SYSUI_STATE_QUICK_SETTINGS_EXPANDED;

            boolean wasExpanded = (lastSysUIFlags & isShadeExpandedFlag) != 0;