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

Commit 1c32931e authored by Ats Jenk's avatar Ats Jenk Committed by Automerger Merge Worker
Browse files

Merge "Position bubbles from right to left" into tm-qpr-dev am: c25b379f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18687155



Change-Id: I49387cfbbf333f111691ffddbb147ead81da676a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd9965fa c25b379f

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java

+22 −7
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.wm.shell.bubbles;



import static android.view.View.LAYOUT_DIRECTION_RTL;



import static java.lang.annotation.RetentionPolicy.SOURCE;



import android.annotation.IntDef;
@@ -28,7 +30,6 @@ import android.graphics.Rect; 
import android.graphics.RectF;

import android.util.Log;

import android.view.Surface;

import android.view.View;

import android.view.WindowInsets;

import android.view.WindowManager;

import android.view.WindowMetrics;
@@ -565,16 +566,30 @@ public class BubblePositioner { 
     * @return the position of the bubble on-screen when the stack is expanded.

     */

    public PointF getExpandedBubbleXY(int index, BubbleStackView.StackViewState state) {

        final float positionInRow = index * (mBubbleSize + mSpacingBetweenBubbles);

        boolean showBubblesVertically = showBubblesVertically();

        boolean isRtl = mContext.getResources().getConfiguration().getLayoutDirection()

                == LAYOUT_DIRECTION_RTL;



        int onScreenIndex;

        if (showBubblesVertically || !isRtl) {

            onScreenIndex = index;

        } else {

            // If bubbles are shown horizontally, check if RTL language is used.

            // If RTL is active, position first bubble on the right and last on the left.

            // Last bubble has screen index 0 and first bubble has max screen index value.

            onScreenIndex = state.numberOfBubbles - 1 - index;

        }



        final float positionInRow = onScreenIndex * (mBubbleSize + mSpacingBetweenBubbles);

        final float expandedStackSize = getExpandedStackSize(state.numberOfBubbles);

        final float centerPosition = showBubblesVertically()

        final float centerPosition = showBubblesVertically

                ? mPositionRect.centerY()

                : mPositionRect.centerX();

        // alignment - centered on the edge

        final float rowStart = centerPosition - (expandedStackSize / 2f);

        float x;

        float y;

        if (showBubblesVertically()) {

        if (showBubblesVertically) {

            int inset = mExpandedViewLargeScreenInsetClosestEdge;

            y = rowStart + positionInRow;

            int left = mIsLargeScreen
@@ -591,8 +606,8 @@ public class BubblePositioner { 
            x = rowStart + positionInRow;

        }



        if (showBubblesVertically() && mImeVisible) {

            return new PointF(x, getExpandedBubbleYForIme(index, state));

        if (showBubblesVertically && mImeVisible) {

            return new PointF(x, getExpandedBubbleYForIme(onScreenIndex, state));

        }

        return new PointF(x, y);

    }
@@ -701,7 +716,7 @@ public class BubblePositioner { 
        // Start on the left if we're in LTR, right otherwise.

        final boolean startOnLeft =

                mContext.getResources().getConfiguration().getLayoutDirection()

                        != View.LAYOUT_DIRECTION_RTL;

                        != LAYOUT_DIRECTION_RTL;

        final float startingVerticalOffset = mContext.getResources().getDimensionPixelOffset(

                R.dimen.bubble_stack_starting_offset_y);

        // TODO: placement bug here because mPositionRect doesn't handle the overhanging edge

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/ExpandedAnimationController.java

+20 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.wm.shell.bubbles.animation;



import static android.view.View.LAYOUT_DIRECTION_RTL;



import static com.android.wm.shell.bubbles.BubblePositioner.NUM_VISIBLE_WHEN_RESTING;

import static com.android.wm.shell.bubbles.BubbleStackView.HOME_GESTURE_ENABLED;
@@ -243,6 +245,11 @@ public class ExpandedAnimationController 
            };

        }



        boolean showBubblesVertically = mPositioner.showBubblesVertically();

        final boolean isRtl =

                mLayout.getContext().getResources().getConfiguration().getLayoutDirection()

                        == LAYOUT_DIRECTION_RTL;



        // Animate each bubble individually, since each path will end in a different spot.

        animationsForChildrenFromIndex(0, (index, animation) -> {

            final View bubble = mLayout.getChildAt(index);
@@ -277,9 +284,20 @@ public class ExpandedAnimationController 
            // right side, the first bubble is traveling to the top left, so it leads. During

            // collapse to the left, the first bubble has the shortest travel time back to the stack

            // position, so it leads (and vice versa).

            final boolean firstBubbleLeads =

            final boolean firstBubbleLeads;

            if (showBubblesVertically || !isRtl) {

                firstBubbleLeads =

                        (expanding && !mLayout.isFirstChildXLeftOfCenter(bubble.getTranslationX()))

                            || (!expanding && mLayout.isFirstChildXLeftOfCenter(mCollapsePoint.x));

            } else {

                // For RTL languages, when showing bubbles horizontally, it is reversed. The bubbles

                // are positioned right to left. This means that when expanding from left, the top

                // bubble will lead as it will be positioned on the right. And when expanding from

                // right, the top bubble will have the least travel distance.

                firstBubbleLeads =

                        (expanding && mLayout.isFirstChildXLeftOfCenter(bubble.getTranslationX()))

                            || (!expanding && !mLayout.isFirstChildXLeftOfCenter(mCollapsePoint.x));

            }

            final int startDelay = firstBubbleLeads

                    ? (index * 10)

                    : ((mLayout.getChildCount() - index) * 10);