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

Commit f44562b7 authored by Lyn Han's avatar Lyn Han
Browse files

Reset target, update pointer 

[Part 1]
Add bubbles, expand stack, select bubble.
-> mMagnetizedBubbleDraggingOut = selected bubble

Now add more bubbles
-> ExpandedAnimationController#updateBubblePositions returns early at the selected bubble
-> Bubbles to the right of the selected bubble don't animate to their places.

Fixed by setting mMagnetizedBubbleDraggingOut to null in onGestureFinished
-> BubbleTouchHandler calls this for every gesture
-> Subsequent order animations apply to every bubble.

[Part 2]
Pointer updates once right after adding bubble and does not reflect
final updated order. Fixed by moving updatePointerPosition from
BubbleStackView#addBubble to #updatePointerPosition. (We don't need to
update the pointer if adding a bubble does not change the order.)

Fixes: 152696626
Test: manual: add bubbles, expand stack, select bubble, add more bubbles
        -> pointer stays with selected bubble (overflow flag on and off)
Test: atest SystemUITests

Change-Id: If5f34cf660a8d4b9ce50ad749ebdce5b87660407
parent 0bf55d7d

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+5 −3
Original line number Diff line number Diff line
@@ -947,7 +947,6 @@ public class BubbleStackView extends FrameLayout { 
                new FrameLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT));

        ViewClippingUtil.setClippingDeactivated(bubble.getIconView(), true, mClippingParameters);

        animateInFlyoutForBubble(bubble);

        updatePointerPosition();

        requestUpdate();

        logBubbleEvent(bubble, SysUiStatsLog.BUBBLE_UICHANGED__ACTION__POSTED);

    }
@@ -1006,8 +1005,8 @@ public class BubbleStackView extends FrameLayout { 
            Bubble bubble = bubbles.get(i);

            mBubbleContainer.reorderView(bubble.getIconView(), i);

        }



        updateBubbleZOrdersAndDotPosition(false /* animate */);

        updatePointerPosition();

    }



    void showOverflow() {
@@ -1395,7 +1394,7 @@ public class BubbleStackView extends FrameLayout { 
    /** Called when a drag operation on an individual bubble has started. */

    public void onBubbleDragStart(View bubble) {

        if (DEBUG_BUBBLE_STACK_VIEW) {

            Log.d(TAG, "onBubbleDragStart: bubble=" + bubble);

            Log.d(TAG, "onBubbleDragStart: bubble=" + ((BadgedImageView) bubble).getKey());

        }



        if (mBubbleOverflow != null && bubble.equals(mBubbleOverflow.getIconView())) {
@@ -1910,6 +1909,9 @@ public class BubbleStackView extends FrameLayout { 
            return;

        }

        int index = getBubbleIndex(mExpandedBubble);

        if (index == -1) {

            return;

        }

        float bubbleLeftFromScreenLeft = mExpandedAnimationController.getBubbleLeft(index);

        float halfBubble = mBubbleSize / 2f;

        float bubbleCenter = bubbleLeftFromScreenLeft + halfBubble;

packages/SystemUI/src/com/android/systemui/bubbles/animation/ExpandedAnimationController.java

+1 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ public class ExpandedAnimationController 
    /** Resets bubble drag out gesture flags. */

    public void onGestureFinished() {

        mBubbleDraggedOutEnough = false;

        mMagnetizedBubbleDraggingOut = null;

        updateBubblePositions();

    }