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

Commit e792bc3a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add support for taskbar background to wrap around hotseat"" into main

parents 26a0afe1 9c09196d

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

+0 −19
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static com.android.launcher3.taskbar.TaskbarLauncherStateController.FLAG_ 


import android.animation.Animator;

import android.animation.AnimatorSet;

import android.graphics.Rect;

import android.window.RemoteTransition;



import androidx.annotation.NonNull;
@@ -189,24 +188,6 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
                placeholderDuration));

    }



    /**

     * Returns the bounds of launcher's hotseat.

     */

    public void getHotseatBounds(Rect hotseatBoundsOut) {

        DeviceProfile launcherDP = mLauncher.getDeviceProfile();

        if (launcherDP.isQsbInline) {

            // Not currently supported.

            hotseatBoundsOut.setEmpty();

            return;

        }

        int left = (launcherDP.widthPx - launcherDP.getHotseatWidthPx()

                - mLauncher.getHotseat().getUnusedHorizontalSpace()) / 2;

        int right = left + launcherDP.getHotseatWidthPx();

        int bottom = launcherDP.getHotseatLayoutPadding(mLauncher).bottom;

        int top = bottom - launcherDP.hotseatCellHeightPx;

        hotseatBoundsOut.set(left, top, right, bottom);

    }



    /**

     * Should be called from onResume() and onPause(), and animates the Taskbar accordingly.

     */

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

+1 −11
Original line number Diff line number Diff line
@@ -208,11 +208,8 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT 
     * Creates and returns a {@link RevealOutlineAnimation} Animator that updates the stashed handle

     * shape and size. When stashed, the shape is a thin rounded pill. When unstashed, the shape

     * morphs into the size of where the taskbar icons will be.

     *

     * @param taskbarToHotseatOffsets A Rect of offsets used to transform the bounds of the

     *                                stashed handle to wrap around the hotseat items.

     */

    public Animator createRevealAnimToIsStashed(boolean isStashed, Rect taskbarToHotseatOffsets) {

    public Animator createRevealAnimToIsStashed(boolean isStashed) {

        Rect visualBounds = mControllers.taskbarViewController.getIconLayoutVisualBounds();

        float startRadius = mStashedHandleRadius;
@@ -223,13 +220,6 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT 
            visualBounds.bottom += heightDiff;



            startRadius = visualBounds.height() / 2f;



            // We use these offsets to create a larger stashed handle to wrap around the items

            // of the hotseat. This is only used for certain animations.

            visualBounds.top +=  taskbarToHotseatOffsets.top;

            visualBounds.bottom += taskbarToHotseatOffsets.bottom;

            visualBounds.left += taskbarToHotseatOffsets.left;

            visualBounds.right += taskbarToHotseatOffsets.right;

        }



        final RevealOutlineAnimation handleRevealProvider = new RoundedRectRevealOutlineProvider(

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

+0 −44
Original line number Diff line number Diff line
@@ -361,38 +361,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        dispatchDeviceProfileChanged();

    }



    /**

     * Calculate the offsets needed to transform the transient taskbar bounds to the hotseat bounds.

     * @return The offsets will be stored in a Rect

     */

    public Rect calculateTaskbarToHotseatOffsets(Rect hotseatBounds) {

        Rect taskbar = getTransientTaskbarBounds();

        Rect offsets = new Rect();



        offsets.left = hotseatBounds.left - taskbar.left;

        offsets.right = hotseatBounds.right - taskbar.right;



        int heightDiff = hotseatBounds.height() - taskbar.height();

        offsets.top = (taskbar.height() - heightDiff) / 2;



        int gleanedTaskbarPadding = (mDeviceProfile.taskbarHeight

                - getTransientTaskbarBounds().height()) / 2;

        offsets.left -= gleanedTaskbarPadding;

        offsets.top -= gleanedTaskbarPadding;

        offsets.right += gleanedTaskbarPadding;



        // Bottom is relative to the bottom of layout, so we can calculate it with padding included.

        offsets.bottom = (hotseatBounds.height() - taskbar.height()) / 2;



        // Update bounds in taskbar background

        if (hotseatBounds.isEmpty()) {

            mDragLayer.getTaskbarToHotseatOffsetRect().setEmpty();

        } else {

            mDragLayer.getTaskbarToHotseatOffsetRect().set(offsets);

        }

        return offsets;

    }



    /**

     * Copy the original DeviceProfile, match the number of hotseat icons and qsb width and update

     * the icon size
@@ -1716,18 +1684,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        return AnimatorPlaybackController.wrap(fullAnimation, duration);

    }



    /**

     * Returns the bounds of launcher's hotseat (if exists).

     */

    public void getHotseatBounds(Rect hotseatBoundsOut) {

        TaskbarUIController uiController = mControllers.uiController;

        if (uiController instanceof LauncherTaskbarUIController launcherController) {

            launcherController.getHotseatBounds(hotseatBoundsOut);

        } else {

            hotseatBoundsOut.setEmpty();

        }

    }



    /**

     * Called when we determine the touchable region.

     *

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

+4 −14
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.graphics.Canvas 
import android.graphics.Color

import android.graphics.Paint

import android.graphics.Path

import android.graphics.Rect

import android.graphics.RectF

import com.android.app.animation.Interpolators

import com.android.internal.policy.ScreenDecorationsUtils
@@ -60,9 +59,6 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { 
    var translationYForSwipe = 0f

    var translationYForStash = 0f



    // When not empty, we can use this to transform transient taskbar background to hotseat bounds.

    val taskbarToHotseatOffsetRect = Rect()



    private val transientBackgroundBounds = context.transientTaskbarBounds



    private val shadowAlpha: Float
@@ -230,12 +226,6 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { 
        val radius = newBackgroundHeight / 2f

        val bottomMarginProgress = bottomMargin * ((1f - progress) / 2f)



        // Used to transform the background so that it wraps around the items on the hotseat.

        val hotseatOffsetLeft = taskbarToHotseatOffsetRect.left * progress

        val hotseatOffsetTop = taskbarToHotseatOffsetRect.top * progress

        val hotseatOffsetRight = taskbarToHotseatOffsetRect.right * progress

        val hotseatOffsetBottom = taskbarToHotseatOffsetRect.bottom * progress



        // Aligns the bottom with the bottom of the stashed handle.

        val bottom =

            canvas.height - bottomMargin +
@@ -260,10 +250,10 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { 
        strokePaint.alpha = (paint.alpha * strokeAlpha) / 255



        lastDrawnTransientRect.set(

            transientBackgroundBounds.left + halfWidthDelta + hotseatOffsetLeft,

            bottom - newBackgroundHeight + hotseatOffsetTop,

            transientBackgroundBounds.right - halfWidthDelta + hotseatOffsetRight,

            bottom + hotseatOffsetBottom,

            transientBackgroundBounds.left + halfWidthDelta,

            bottom - newBackgroundHeight,

            transientBackgroundBounds.right - halfWidthDelta,

            bottom

        )

        val horizontalInset = fullWidth * widthInsetPercentage

        lastDrawnTransientRect.inset(horizontalInset, 0f)

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

+0 −6
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UN 


import android.content.Context;

import android.graphics.Canvas;

import android.graphics.Rect;

import android.graphics.RectF;

import android.media.permission.SafeCloseable;

import android.util.AttributeSet;
@@ -260,11 +259,6 @@ public class TaskbarDragLayer extends BaseDragLayer<TaskbarActivityContext> { 
        return mBackgroundRenderer.getLastDrawnTransientRect();

    }



    /** Returns the rect used to transform transient taskbar to the hotseat */

    public Rect getTaskbarToHotseatOffsetRect() {

        return mBackgroundRenderer.getTaskbarToHotseatOffsetRect();

    }



    @Override

    public boolean dispatchTouchEvent(MotionEvent ev) {

        TestLogging.recordMotionEvent(TestProtocol.SEQUENCE_MAIN, "Touch event", ev);