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

Commit 9a90c2d5 authored by Mady Mellor's avatar Mady Mellor
Browse files

Hide launcher when freeform tasks are visible 

This CL introduces a new controller to manage the visibility of the
launcher workspace when desktop mode is active and freeform tasks
are visible.

This controller will be notified when the sysui state flag related
to freeform task visibility is changed.

The controller will modify the workspace visibility as well as
the flags on the activity indicating if it's been paused / resumed
based on freeform tasks being visible or not.

Bug: 245569277
Test: manual -  enable desktop mode and open some freeform tasks
             => observe that the contents of launcher is hidden and
                taskbar shows
             -  remove all of the freeform tasks
             => observe that the contents of launcher reappears along
                with the hotseat.
Change-Id: I378ab97b40cbb954a06f4e2426b195efddad905c
parent 41235d52

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

0 → 100644
+98 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.launcher3.statehandlers;



import android.os.SystemProperties;

import android.view.View;



import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.statemanager.StatefulActivity;

import com.android.launcher3.uioverrides.QuickstepLauncher;



/**

 * Controls the visibility of the workspace and the resumed / paused state when desktop mode

 * is enabled.

 */

public class DesktopVisibilityController {



    private final Launcher mLauncher;



    private boolean mFreeformTasksVisible;

    private boolean mInOverviewState;



    public DesktopVisibilityController(Launcher launcher) {

        mLauncher = launcher;

    }



    /**

     * Whether desktop mode is supported.

     */

    private boolean isDesktopModeSupported() {

        return SystemProperties.getBoolean("persist.wm.debug.desktop_mode", false);

    }



    /**

     * Whether freeform windows are visible in desktop mode.

     */

    public boolean areFreeformTasksVisible() {

        return mFreeformTasksVisible;

    }



    /**

     * Sets whether freeform windows are visible and updates launcher visibility based on that.

     */

    public void setFreeformTasksVisible(boolean freeformTasksVisible) {

        if (freeformTasksVisible != mFreeformTasksVisible) {

            mFreeformTasksVisible = freeformTasksVisible;

            updateLauncherVisibility();

        }

    }



    /**

     * Sets whether the overview is visible and updates launcher visibility based on that.

     */

    public void setOverviewStateEnabled(boolean overviewStateEnabled) {

        if (overviewStateEnabled != mInOverviewState) {

            mInOverviewState = overviewStateEnabled;

            updateLauncherVisibility();

        }

    }



    /**

     * Updates launcher visibility and state to look like it is paused or resumed depending on

     * whether freeform windows are showing in desktop mode.

     */

    private void updateLauncherVisibility() {

        StatefulActivity<LauncherState> activity =

                QuickstepLauncher.ACTIVITY_TRACKER.getCreatedActivity();

        View workspaceView = mLauncher.getWorkspace();

        if (activity == null || workspaceView == null || !isDesktopModeSupported()) return;



        if (mFreeformTasksVisible) {

            workspaceView.setVisibility(View.INVISIBLE);

            if (!mInOverviewState) {

                // When freeform is visible & we're not in overview, we want launcher to appear

                // paused, this ensures that taskbar displays.

                activity.setPaused();

            }

        } else {

            workspaceView.setVisibility(View.VISIBLE);

            // If freeform isn't visible ensure that launcher appears resumed to behave normally.

            activity.setResumed();

        }

    }

}

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+7 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ import com.android.launcher3.popup.SystemShortcut; 
import com.android.launcher3.proxy.ProxyActivityStarter;

import com.android.launcher3.proxy.StartActivityParams;

import com.android.launcher3.statehandlers.DepthController;

import com.android.launcher3.statehandlers.DesktopVisibilityController;

import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;

import com.android.launcher3.statemanager.StateManager.StateHandler;

import com.android.launcher3.taskbar.LauncherTaskbarUIController;
@@ -167,6 +168,7 @@ public class QuickstepLauncher extends Launcher { 
    private FixedContainerItems mAllAppsPredictions;

    private HotseatPredictionController mHotseatPredictionController;

    private DepthController mDepthController;

    private DesktopVisibilityController mDesktopVisibilityController;

    private QuickstepTransitionManager mAppTransitionManager;

    private OverviewActionsView mActionsView;

    private TISBindHelper mTISBindHelper;
@@ -207,6 +209,7 @@ public class QuickstepLauncher extends Launcher { 


        mTISBindHelper = new TISBindHelper(this, this::onTISConnected);

        mDepthController = new DepthController(this);

        mDesktopVisibilityController = new DesktopVisibilityController(this);

        mHotseatPredictionController = new HotseatPredictionController(this);



        mEnableWidgetDepth = ENABLE_WIDGET_PICKER_DEPTH.get()
@@ -732,6 +735,10 @@ public class QuickstepLauncher extends Launcher { 
        return mDepthController;

    }



    public DesktopVisibilityController getDesktopVisibilityController() {

        return mDesktopVisibilityController;

    }



    @Nullable

    public UnfoldTransitionProgressProvider getUnfoldTransitionProgressProvider() {

        return mUnfoldTransitionProgressProvider;

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+10 −4
Original line number Diff line number Diff line
@@ -1882,11 +1882,17 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
    }



    private void finishCurrentTransitionToRecents() {

        // TODO(b/245569277#comment2): enable once isFreeformActive is implemented

        if (mRecentsAnimationController != null

                && mActivityInterface.getDesktopVisibilityController() != null

                && mActivityInterface.getDesktopVisibilityController().areFreeformTasksVisible()) {

            mRecentsAnimationController.finish(true /* toRecents */,

                    () -> mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED));

        } else {

            mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);

            if (mRecentsAnimationController != null) {

                mRecentsAnimationController.detachNavigationBarFromApp(true);

            }

        }

        ActiveGestureLog.INSTANCE.addLog(

                /* event= */ "finishRecentsAnimation",

                /* extras= */ true,

quickstep/src/com/android/quickstep/BaseActivityInterface.java

+6 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.launcher3.R; 
import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.statehandlers.DepthController;

import com.android.launcher3.statehandlers.DesktopVisibilityController;

import com.android.launcher3.statemanager.BaseState;

import com.android.launcher3.statemanager.StatefulActivity;

import com.android.launcher3.taskbar.TaskbarUIController;
@@ -141,6 +142,11 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T 
        return null;

    }



    @Nullable

    public DesktopVisibilityController getDesktopVisibilityController() {

        return null;

    }



    @Nullable

    public abstract TaskbarUIController getTaskbarController();

quickstep/src/com/android/quickstep/LauncherActivityInterface.java

+11 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.launcher3.LauncherInitListener; 
import com.android.launcher3.LauncherState;

import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.statehandlers.DepthController;

import com.android.launcher3.statehandlers.DesktopVisibilityController;

import com.android.launcher3.statemanager.StateManager;

import com.android.launcher3.taskbar.LauncherTaskbarUIController;

import com.android.launcher3.touch.PagedOrientationHandler;
@@ -173,6 +174,16 @@ public final class LauncherActivityInterface extends 
        return launcher.getDepthController();

    }



    @Nullable

    @Override

    public DesktopVisibilityController getDesktopVisibilityController() {

        QuickstepLauncher launcher = getCreatedActivity();

        if (launcher == null) {

            return null;

        }

        return launcher.getDesktopVisibilityController();

    }



    @Nullable

    @Override

    public LauncherTaskbarUIController getTaskbarController() {