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

Commit 60240207 authored by Liran Binyamin's avatar Liran Binyamin
Browse files

Handle the event of first bubble added. 

When the first bubble is added we set the visibility of the bubble bar
to VISIBLE if the stash controller is unstashed. The issue is that once
bubbles are gone we no longer update the stash state in the controller,
so it becomes stale and can't be used when the first bubble is added.

This change introduces a new method for handling the transition from
the state where both bar and handle are invisible into the state where
one of them becomes visible. We can't use the existing stashBubbleBar
and showBubbleBar methods because those transition from one to the other.
Using them when both are invisible results in one of them becoming visible
and then invisible again.

Fixes: 290992144
Fixes: 291074646

Test: Manual:
       - Add bubble in the test app by double-tapping on a chat (non expanding notification)
       - Observe that the handle becomes visible and the bar is invisible
       - Dismiss bubble
       - Add bubble in the test app by tapping on the button on the right (auto expanding)
       - Observe that the bar becomes visible and expanded
Change-Id: I61334c67c255a6ed074fa8c834f4a5a1547539bf
parent f351e515

quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java

+11 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ public class BubbleBarController extends IBubblesListener.Stub { 
    private void applyViewChanges(BubbleBarViewUpdate update) {

        final boolean isCollapsed = (update.expandedChanged && !update.expanded)

                || (!update.expandedChanged && !mBubbleBarViewController.isExpanded());

        BubbleBarItem previouslySelectedBubble = mSelectedBubble;

        BubbleBarBubble bubbleToSelect = null;

        if (!update.removedBubbles.isEmpty()) {

            for (int i = 0; i < update.removedBubbles.size(); i++) {
@@ -321,6 +322,11 @@ public class BubbleBarController extends IBubblesListener.Stub { 
        mBubbleBarViewController.setHiddenForBubbles(mBubbles.isEmpty());

        mBubbleStashedHandleViewController.setHiddenForBubbles(mBubbles.isEmpty());



        if (mBubbles.isEmpty()) {

            // all bubbles were removed. clear the selected bubble

            mSelectedBubble = null;

        }



        if (update.updatedBubble != null) {

            // Updates mean the dot state may have changed; any other changes were updated in

            // the populateBubble step.
@@ -357,6 +363,11 @@ public class BubbleBarController extends IBubblesListener.Stub { 
        if (bubbleToSelect != null) {

            setSelectedBubble(bubbleToSelect);

        }



        if (previouslySelectedBubble == null) {

            mBubbleStashController.animateToInitialState(update.expanded);

        }



        if (update.expandedChanged) {

            if (update.expanded != mBubbleBarViewController.isExpanded()) {

                mBubbleBarViewController.setExpandedFromSysui(update.expanded);

quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java

+3 −1
Original line number Diff line number Diff line
@@ -206,10 +206,12 @@ public class BubbleBarViewController { 


    // TODO: (b/273592694) animate it

    private void updateVisibilityForStateChange() {

        if (!mHiddenForSysui && !mBubbleStashController.isStashed() && !mHiddenForNoBubbles) {

        if (!mHiddenForSysui && !mHiddenForNoBubbles) {

            mBarView.setVisibility(VISIBLE);

        } else {

            mBarView.setVisibility(INVISIBLE);

            mBarView.setAlpha(0);

            mBarView.setExpanded(false);

        }

    }

quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java

+44 −19
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ public class BubbleStashController { 
    private int mUnstashedHeight;

    private boolean mBubblesShowingOnHome;

    private boolean mBubblesShowingOnOverview;

    private boolean mIsSysuiLocked;



    @Nullable

    private AnimatorSet mAnimator;
@@ -95,14 +96,6 @@ public class BubbleStashController { 


        mStashedHeight = mHandleViewController.getStashedHeight();

        mUnstashedHeight = mHandleViewController.getUnstashedHeight();



        bubbleControllers.runAfterInit(() -> {

            if (mTaskbarStashController.isStashed()) {

                stashBubbleBar();

            } else {

                showBubbleBar(false /* expandBubbles */);

            }

        });

    }



    /**
@@ -119,6 +112,40 @@ public class BubbleStashController { 
        return mIsStashed;

    }



    /**

     * Animates the bubble bar and handle to their initial state, transitioning from the state where

     * both views are invisible. Called when the first bubble is added or when the device is

     * unlocked.

     *

     * <p>Normally either the bubble bar or the handle is visible,

     * and {@link #showBubbleBar(boolean)} and {@link #stashBubbleBar()} are used to transition

     * between these two states. But the transition from the state where both the bar and handle

     * are invisible is slightly different.

     *

     * <p>The initial state will depend on the current state of the device, i.e. overview, home etc

     * and whether bubbles are requested to be expanded.

     */

    public void animateToInitialState(boolean expanding) {

        AnimatorSet animatorSet = new AnimatorSet();

        if (expanding || mBubblesShowingOnHome || mBubblesShowingOnOverview) {

            mIsStashed = false;

            animatorSet.playTogether(mIconScaleForStash.animateToValue(1),

                    mIconTranslationYForStash.animateToValue(getBubbleBarTranslationY()),

                    mIconAlphaForStash.animateToValue(1));

        } else {

            mIsStashed = true;

            animatorSet.playTogether(mBubbleStashedHandleAlpha.animateToValue(1));

        }



        animatorSet.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationEnd(Animator animation) {

                onIsStashedChanged();

            }

        });

        animatorSet.setDuration(BAR_STASH_DURATION).start();

    }



    /**

     * Called when launcher enters or exits the home page. Bubbles are unstashed on home.

     */
@@ -172,12 +199,11 @@ public class BubbleStashController { 


    /** Called when sysui locked state changes, when locked, bubble bar is stashed. */

    public void onSysuiLockedStateChange(boolean isSysuiLocked) {

        if (isSysuiLocked) {

            // TODO: should the normal path flip mBubblesOnHome / check if this is needed

            // If we're locked, we're no longer showing on home.

            mBubblesShowingOnHome = false;

            mBubblesShowingOnOverview = false;

            stashBubbleBar();

        if (isSysuiLocked != mIsSysuiLocked) {

            mIsSysuiLocked = isSysuiLocked;

            if (!mIsSysuiLocked) {

                animateToInitialState(false /* expanding */);

            }

        }

    }
@@ -256,11 +282,7 @@ public class BubbleStashController { 
            firstHalfDurationScale = 0.5f;

            secondHalfDurationScale = 0.75f;



            // If we're on home, adjust the translation so the bubble bar aligns with hotseat.

            // Otherwise we're either showing in an app or in overview. In either case adjust it so

            // the bubble bar aligns with the taskbar.

            final float translationY = mBubblesShowingOnHome ? getBubbleBarTranslationYForHotseat()

                    : getBubbleBarTranslationYForTaskbar();

            final float translationY = getBubbleBarTranslationY();



            fullLengthAnimatorSet.playTogether(

                    mIconScaleForStash.animateToValue(1),
@@ -317,6 +339,9 @@ public class BubbleStashController { 
    }



    float getBubbleBarTranslationY() {

        // If we're on home, adjust the translation so the bubble bar aligns with hotseat.

        // Otherwise we're either showing in an app or in overview. In either case adjust it so

        // the bubble bar aligns with the taskbar.

        return mBubblesShowingOnHome ? getBubbleBarTranslationYForHotseat()

                : getBubbleBarTranslationYForTaskbar();

    }

quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashedHandleViewController.java

+25 −17
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public class BubbleStashedHandleViewController { 
    private BubbleStashController mBubbleStashController;

    private RegionSamplingHelper mRegionSamplingHelper;

    private int mBarSize;

    private int mStashedTaskbarHeight;

    private int mStashedHandleWidth;

    private int mStashedHandleHeight;
@@ -92,7 +93,7 @@ public class BubbleStashedHandleViewController { 


        mTaskbarStashedHandleAlpha.get(0).setValue(0);



        final int stashedTaskbarHeight = resources.getDimensionPixelSize(

        mStashedTaskbarHeight = resources.getDimensionPixelSize(

                R.dimen.bubblebar_stashed_size);

        mStashedHandleView.setOutlineProvider(new ViewOutlineProvider() {

            @Override
@@ -115,11 +116,15 @@ public class BubbleStashedHandleViewController { 
                    }

                }, Executors.UI_HELPER_EXECUTOR);



        mStashedHandleView.addOnLayoutChangeListener((view, i, i1, i2, i3, i4, i5, i6, i7) -> {

        mStashedHandleView.addOnLayoutChangeListener((view, i, i1, i2, i3, i4, i5, i6, i7) ->

                updateBounds());

    }



    private void updateBounds() {

        // As more bubbles get added, the icon bounds become larger. To ensure a consistent

        // handle bar position, we pin it to the edge of the screen.

        Rect bubblebarRect = mBarViewController.getBubbleBarBounds();

            final int stashedCenterY = view.getHeight() - stashedTaskbarHeight / 2;

        final int stashedCenterY = mStashedHandleView.getHeight() - mStashedTaskbarHeight / 2;



        mStashedHandleBounds.set(

                bubblebarRect.right - mStashedHandleWidth,
@@ -128,9 +133,8 @@ public class BubbleStashedHandleViewController { 
                stashedCenterY + mStashedHandleHeight / 2);

        mStashedHandleView.updateSampledRegion(mStashedHandleBounds);



            view.setPivotX(view.getWidth());

            view.setPivotY(view.getHeight() - stashedTaskbarHeight / 2f);

        });

        mStashedHandleView.setPivotX(mStashedHandleView.getWidth());

        mStashedHandleView.setPivotY(mStashedHandleView.getHeight() - mStashedTaskbarHeight / 2f);

    }



    public void onDestroy() {
@@ -188,6 +192,7 @@ public class BubbleStashedHandleViewController { 
            mStashedHandleView.setVisibility(VISIBLE);

        } else {

            mStashedHandleView.setVisibility(INVISIBLE);

            mStashedHandleView.setAlpha(0);

        }

        updateRegionSampling();

    }
@@ -235,6 +240,9 @@ public class BubbleStashedHandleViewController { 
     */

    public Animator createRevealAnimToIsStashed(boolean isStashed) {

        Rect bubbleBarBounds = new Rect(mBarViewController.getBubbleBarBounds());

        // the bubble bar may have been invisible when the bounds were previously calculated,

        // update them again to ensure they're correct.

        updateBounds();



        // Account for the full visual height of the bubble bar

        int heightDiff = (mBarSize - bubbleBarBounds.height()) / 2;