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

Commit da1a7162 authored by Liran Binyamin's avatar Liran Binyamin Committed by Android (Google) Code Review
Browse files

Merge "Suppress bubble animation when bar is hidden" into main

parents 34f2c92e 0b114ebd
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -313,8 +313,11 @@ public class BubbleBarController extends IBubblesListener.Stub {
                || (!update.expandedChanged && !mBubbleBarViewController.isExpanded());
        final boolean isExpanding = update.expandedChanged && update.expanded;
        // don't animate bubbles if this is the initial state because we may be unfolding or
        // enabling gesture nav
        final boolean suppressAnimation = update.initialState;
        // enabling gesture nav. also suppress animation if the bubble bar is hidden for sysui e.g.
        // the shade is open, or we're locked.
        final boolean suppressAnimation =
                update.initialState || mBubbleBarViewController.isHiddenForSysui();

        BubbleBarItem previouslySelectedBubble = mSelectedBubble;
        BubbleBarBubble bubbleToSelect = null;
        if (!update.removedBubbles.isEmpty()) {
+5 −0
Original line number Diff line number Diff line
@@ -266,6 +266,11 @@ public class BubbleBarViewController {
        mBarView.setUpdateSelectedBubbleAfterCollapse(updateSelectedBubbleAfterCollapse);
    }

    /** Returns whether the bubble bar should be hidden because of the current sysui state. */
    boolean isHiddenForSysui() {
        return mHiddenForSysui;
    }

    /**
     * Sets whether the bubble bar should be hidden due to SysUI state (e.g. on lockscreen).
     */