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

Commit 4e7411c5 authored by Tony Wickham's avatar Tony Wickham
Browse files

Temporary workaround for taskbar hiding in Desktop 

Taskbar still hides during the transition, but then reappears
after settling.

Flag: LEGACY ENABLE_HOME_TRANSITION_LISTENER enabled
Bug: 314207404
Test: manual
Change-Id: Ie3d29b3d40e513f39cb34176baa781c9f2853e57
parent 710634b1

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

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

package com.android.launcher3.statehandlers;



import static android.view.View.VISIBLE;



import static com.android.launcher3.LauncherState.BACKGROUND_APP;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.quickstep.views.DesktopTaskView.isDesktopModeSupported;
@@ -269,6 +271,9 @@ public class DesktopVisibilityController { 
        if (dragLayer != null) {

            dragLayer.setVisibility(visibility);

        }

        if (mLauncher instanceof QuickstepLauncher ql && ql.getTaskbarUIController() != null) {

            ql.getTaskbarUIController().onLauncherVisibilityChanged(visibility == VISIBLE);

        }

    }



    private void markLauncherPaused() {

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java

+13 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.launcher3.statemanager.BaseState.FLAG_NON_INTERACTIVE; 
import static com.android.launcher3.taskbar.TaskbarEduTooltipControllerKt.TOOLTIP_STEP_FEATURES;

import static com.android.launcher3.taskbar.TaskbarLauncherStateController.FLAG_VISIBLE;

import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;

import static com.android.quickstep.views.DesktopTaskView.isDesktopModeSupported;



import android.animation.Animator;

import android.animation.AnimatorSet;
@@ -40,11 +41,13 @@ import com.android.launcher3.anim.AnimatedFloat; 
import com.android.launcher3.logging.InstanceId;

import com.android.launcher3.logging.InstanceIdSequence;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.statehandlers.DesktopVisibilityController;

import com.android.launcher3.taskbar.bubbles.BubbleBarController;

import com.android.launcher3.uioverrides.QuickstepLauncher;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.MultiPropertyFactory;

import com.android.launcher3.util.OnboardingPrefs;

import com.android.quickstep.LauncherActivityInterface;

import com.android.quickstep.RecentsAnimationCallbacks;

import com.android.quickstep.util.GroupTask;

import com.android.quickstep.views.RecentsView;
@@ -199,6 +202,16 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
            return null;

        }



        DesktopVisibilityController desktopController =

                LauncherActivityInterface.INSTANCE.getDesktopVisibilityController();

        final boolean onDesktop =

                isDesktopModeSupported()

                        && desktopController != null

                        && desktopController.areFreeformTasksVisible();

        if (onDesktop) {

            isVisible = false;

        }



        mTaskbarLauncherStateController.updateStateForFlag(FLAG_VISIBLE, isVisible);

        return mTaskbarLauncherStateController.applyState(fromInit ? 0 : duration, startAnimation);

    }