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

Commit e62cb764 authored by Jagrut Desai's avatar Jagrut Desai
Browse files

Extend DesktopVisibilityController Funcationality to handle taskbar corner... 

Extend DesktopVisibilityController Funcationality to handle taskbar corner radius in desktop windowing mode

This cl includes
	- adding support for listenting into when desktop window mode task is resizing and we need to adjust taskbar corner radius.

Test: Presubmit
Bug: 348335379
Flag: com.android.window.flags.enable_desktop_windowing_mode
Change-Id: Ic6ea3dc1353df7fa4b8079106f20fade0f740683
parent cafe06f6

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

+45 −2
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ import com.android.launcher3.util.DisplayController; 
import com.android.quickstep.GestureState;

import com.android.quickstep.SystemUiProxy;

import com.android.wm.shell.desktopmode.IDesktopTaskListener;

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;



import java.util.HashSet;

import java.util.Set;

import java.util.concurrent.Executor;



/**

 * Controls the visibility of the workspace and the resumed / paused state when desktop mode
@@ -51,6 +51,7 @@ public class DesktopVisibilityController { 
    private static final boolean DEBUG = false;

    private final Launcher mLauncher;

    private final Set<DesktopVisibilityListener> mDesktopVisibilityListeners = new HashSet<>();

    private final Set<TaskbarDesktopModeListener> mTaskbarDesktopModeListeners = new HashSet<>();



    private int mVisibleDesktopTasksCount;

    private boolean mInOverviewState;
@@ -110,6 +111,16 @@ public class DesktopVisibilityController { 
        mDesktopVisibilityListeners.remove(listener);

    }



    /** Registers a listener for Taskbar changes in Desktop Mode. */

    public void registerTaskbarDesktopModeListener(TaskbarDesktopModeListener listener) {

        mTaskbarDesktopModeListeners.add(listener);

    }



    /** Removes a previously registered listener for Taskbar changes in Desktop Mode. */

    public void unregisterTaskbarDesktopModeListener(TaskbarDesktopModeListener listener) {

        mTaskbarDesktopModeListeners.remove(listener);

    }



    /**

     * Sets the number of desktop windows that are visible and updates launcher visibility based on

     * it.
@@ -201,6 +212,16 @@ public class DesktopVisibilityController { 
        DisplayController.handleInfoChangeForDesktopMode(mLauncher);

    }



    private void notifyTaskbarDesktopModeListeners(boolean doesAnyTaskRequireTaskbarRounding) {

        if (DEBUG) {

            Log.d(TAG, "notifyTaskbarDesktopModeListeners: doesAnyTaskRequireTaskbarRounding="

                    + doesAnyTaskRequireTaskbarRounding);

        }

        for (TaskbarDesktopModeListener listener : mTaskbarDesktopModeListeners) {

            listener.onTaskbarCornerRoundingUpdate(doesAnyTaskRequireTaskbarRounding);

        }

    }



    /**

     * TODO: b/333533253 - Remove after flag rollout

     */
@@ -377,7 +398,29 @@ public class DesktopVisibilityController { 


        @Override

        public void onStashedChanged(int displayId, boolean stashed) {

            Log.w(TAG, "IDesktopTaskListener: onStashedChanged is deprecated");

            Log.w(TAG, "DesktopTaskListenerImpl: onStashedChanged is deprecated");

        }



        @Override

        public void onTaskbarCornerRoundingUpdate(boolean doesAnyTaskRequireTaskbarRounding) {

            MAIN_EXECUTOR.execute(() -> {

                if (mController != null && DesktopModeStatus.useRoundedCorners()) {

                    Log.d(TAG, "DesktopTaskListenerImpl: doesAnyTaskRequireTaskbarRounding= "

                            + doesAnyTaskRequireTaskbarRounding);

                    mController.notifyTaskbarDesktopModeListeners(

                            doesAnyTaskRequireTaskbarRounding);

                }

            });

        }

    }



    /** A listener for Taskbar in Desktop Mode. */

    public interface TaskbarDesktopModeListener {

        /**

         * Callback for when task is resized in desktop mode.

         *

         * @param doesAnyTaskRequireTaskbarRounding whether task requires taskbar corner roundness.

         */

        void onTaskbarCornerRoundingUpdate(boolean doesAnyTaskRequireTaskbarRounding);

    }

}

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

+3 −2
Original line number Diff line number Diff line
@@ -347,8 +347,9 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
                new KeyboardQuickSwitchController(),

                new TaskbarPinningController(this, () ->

                        DisplayController.isInDesktopMode(this)),

                bubbleControllersOptional);



                bubbleControllersOptional,

                new TaskbarDesktopModeController(

                        LauncherActivityInterface.INSTANCE::getDesktopVisibilityController));

        mLauncherPrefs = LauncherPrefs.get(this);

    }

quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt

+12 −4
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.graphics.Path 
import android.graphics.Rect

import android.graphics.RectF

import com.android.app.animation.Interpolators

import com.android.internal.policy.ScreenDecorationsUtils

import com.android.launcher3.R

import com.android.launcher3.Utilities

import com.android.launcher3.Utilities.mapRange
@@ -70,8 +71,8 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { 
    private var keyShadowDistance = 0f

    private var bottomMargin = 0



    private val fullCornerRadius = context.cornerRadius.toFloat()

    private var cornerRadius = fullCornerRadius

    private val fullCornerRadius: Float

    private var cornerRadius = 0f

    private var widthInsetPercentage = 0f

    private val square = Path()

    private val circle = Path()
@@ -101,7 +102,14 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { 
            shadowAlpha = LIGHT_THEME_SHADOW_ALPHA

        }



        setCornerRoundness(DEFAULT_ROUNDNESS)

        if (DisplayController.isInDesktopMode(context)) {

            fullCornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(context)

            cornerRadius = fullCornerRadius

        } else {

            fullCornerRadius = context.cornerRadius.toFloat()

            cornerRadius = fullCornerRadius

            setCornerRoundness(MAX_ROUNDNESS)

        }

    }



    fun updateStashedHandleWidth(context: TaskbarActivityContext, res: Resources) {
@@ -273,7 +281,7 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { 
    }



    companion object {

        const val DEFAULT_ROUNDNESS = 1f

        const val MAX_ROUNDNESS = 1f

        private const val DARK_THEME_STROKE_ALPHA = 51

        private const val LIGHT_THEME_STROKE_ALPHA = 41

        private const val DARK_THEME_SHADOW_ALPHA = 51f

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

+14 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.launcher3.anim.AnimatedFloat; 
import com.android.launcher3.taskbar.allapps.TaskbarAllAppsController;

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

import com.android.launcher3.taskbar.overlay.TaskbarOverlayController;

import com.android.launcher3.util.DisplayController;

import com.android.systemui.shared.rotation.RotationButtonController;



import java.io.PrintWriter;
@@ -64,6 +65,7 @@ public class TaskbarControllers { 
    public final KeyboardQuickSwitchController keyboardQuickSwitchController;

    public final TaskbarPinningController taskbarPinningController;

    public final Optional<BubbleControllers> bubbleControllers;

    public final TaskbarDesktopModeController taskbarDesktopModeController;



    @Nullable private LoggableTaskbarController[] mControllersToLog = null;

    @Nullable private BackgroundRendererController[] mBackgroundRendererControllers = null;
@@ -111,7 +113,8 @@ public class TaskbarControllers { 
            TaskbarEduTooltipController taskbarEduTooltipController,

            KeyboardQuickSwitchController keyboardQuickSwitchController,

            TaskbarPinningController taskbarPinningController,

            Optional<BubbleControllers> bubbleControllers) {

            Optional<BubbleControllers> bubbleControllers,

            TaskbarDesktopModeController taskbarDesktopModeController) {

        this.taskbarActivityContext = taskbarActivityContext;

        this.taskbarDragController = taskbarDragController;

        this.navButtonController = navButtonController;
@@ -138,6 +141,7 @@ public class TaskbarControllers { 
        this.keyboardQuickSwitchController = keyboardQuickSwitchController;

        this.taskbarPinningController = taskbarPinningController;

        this.bubbleControllers = bubbleControllers;

        this.taskbarDesktopModeController = taskbarDesktopModeController;

    }



    /**
@@ -173,6 +177,7 @@ public class TaskbarControllers { 
        taskbarEduTooltipController.init(this);

        keyboardQuickSwitchController.init(this);

        taskbarPinningController.init(this, mSharedState);

        taskbarDesktopModeController.init(this, mSharedState);



        mControllersToLog = new LoggableTaskbarController[] {

                taskbarDragController, navButtonController, navbarButtonsViewController,
@@ -188,7 +193,13 @@ public class TaskbarControllers { 
                taskbarDragLayerController, taskbarScrimViewController,

                voiceInteractionWindowController

        };

        mCornerRoundness.updateValue(TaskbarBackgroundRenderer.DEFAULT_ROUNDNESS);



        if (DisplayController.isInDesktopMode(taskbarActivityContext)) {

            mCornerRoundness.updateValue(taskbarDesktopModeController.getTaskbarCornerRoundness(

                    mSharedState.showCornerRadiusInDesktopMode));

        } else {

            mCornerRoundness.updateValue(TaskbarBackgroundRenderer.MAX_ROUNDNESS);

        }



        mAreAllControllersInitialized = true;

        for (Runnable postInitCallback : mPostInitCallbacks) {
@@ -248,6 +259,7 @@ public class TaskbarControllers { 
        keyboardQuickSwitchController.onDestroy();

        taskbarStashController.onDestroy();

        bubbleControllers.ifPresent(controllers -> controllers.onDestroy());

        taskbarDesktopModeController.onDestroy();



        mControllersToLog = null;

        mBackgroundRendererControllers = null;

quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopModeController.kt

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

 * Copyright (C) 2024 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.taskbar



import com.android.launcher3.statehandlers.DesktopVisibilityController

import com.android.launcher3.statehandlers.DesktopVisibilityController.TaskbarDesktopModeListener

import com.android.launcher3.taskbar.TaskbarBackgroundRenderer.Companion.MAX_ROUNDNESS



/** Handles Taskbar in Desktop Windowing mode. */

class TaskbarDesktopModeController(

    private val desktopVisibilityControllerProvider: () -> DesktopVisibilityController?

) : TaskbarDesktopModeListener {

    private lateinit var taskbarControllers: TaskbarControllers

    private lateinit var taskbarSharedState: TaskbarSharedState



    private val desktopVisibilityController: DesktopVisibilityController?

        get() = desktopVisibilityControllerProvider()



    fun init(controllers: TaskbarControllers, sharedState: TaskbarSharedState) {

        taskbarControllers = controllers

        taskbarSharedState = sharedState

        desktopVisibilityController?.registerTaskbarDesktopModeListener(this)

    }



    override fun onTaskbarCornerRoundingUpdate(doesAnyTaskRequireTaskbarRounding: Boolean) {

        taskbarSharedState.showCornerRadiusInDesktopMode = doesAnyTaskRequireTaskbarRounding

        val cornerRadius = getTaskbarCornerRoundness(doesAnyTaskRequireTaskbarRounding)

        taskbarControllers.taskbarCornerRoundness.animateToValue(cornerRadius).start()

    }



    fun getTaskbarCornerRoundness(doesAnyTaskRequireTaskbarRounding: Boolean): Float {

        return if (doesAnyTaskRequireTaskbarRounding) {

            MAX_ROUNDNESS

        } else {

            0f

        }

    }



    fun onDestroy() = desktopVisibilityController?.unregisterTaskbarDesktopModeListener(this)

}