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

Commit 727903ce authored by Selim Cinek's avatar Selim Cinek
Browse files

Don't do icon animations if we are scrolling fast 

We are now not doing any icon animations anymore
in case we are scrolling fast.

Change-Id: I878d20a8e6114dc58c3908d18cc5ba20e59972cf
Test: add notifications, scroll fast
Bug: 32437839
parent 01a73f9d

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ 
    <!-- Height of a heads up notification in the status bar -->

    <dimen name="notification_max_heads_up_height">148dp</dimen>



    <!-- a threshold in dp per second that is considered fast scrolling -->

    <dimen name="scroll_fast_threshold">1500dp</dimen>



    <!-- Height of a the shelf with the notification icons -->

    <dimen name="notification_shelf_height">32dp</dimen>

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+11 −5
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public class NotificationShelf extends ActivatableNotificationView { 
    private int mNotGoneIndex;

    private boolean mHasItemsInStableShelf;

    private NotificationIconContainer mCollapsedIcons;

    private int mScrollFastThreshold;



    public NotificationShelf(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -101,6 +102,8 @@ public class NotificationShelf extends ActivatableNotificationView { 
        setLayoutParams(layoutParams);

        int padding = getResources().getDimensionPixelOffset(R.dimen.shelf_icon_container_padding);

        mShelfIcons.setPadding(padding, 0, padding, 0);

        mScrollFastThreshold = getResources().getDimensionPixelOffset(

                R.dimen.scroll_fast_threshold);

    }



    @Override
@@ -197,6 +200,7 @@ public class NotificationShelf extends ActivatableNotificationView { 
        int colorTwoBefore = NO_COLOR;

        int previousColor = NO_COLOR;

        float transitionAmount = 0.0f;

        boolean scrollingFast = mAmbientState.getCurrentScrollVelocity() > mScrollFastThreshold;

        int baseZHeight = mAmbientState.getBaseZHeight();

        while (notificationIndex < mHostLayout.getChildCount()) {

            ExpandableView child = (ExpandableView) mHostLayout.getChildAt(notificationIndex);
@@ -223,7 +227,8 @@ public class NotificationShelf extends ActivatableNotificationView { 
                }

            }

            updateNotificationClipHeight(row, notificationClipEnd);

            float inShelfAmount = updateIconAppearance(row, expandAmount, isLastChild);

            float inShelfAmount = updateIconAppearance(row, expandAmount, scrollingFast,

                    isLastChild);

            numViewsInShelf += inShelfAmount;

            int ownColorUntinted = row.getBackgroundColorWithoutTint();

            if (rowTranslationY >= shelfStart && mNotGoneIndex == -1) {
@@ -273,7 +278,7 @@ public class NotificationShelf extends ActivatableNotificationView { 
     * @return the icon amount how much this notification is in the shelf;

     */

    private float updateIconAppearance(ExpandableNotificationRow row, float expandAmount,

            boolean isLastChild) {

            boolean scrollingFast, boolean isLastChild) {

        // Let calculate how much the view is in the shelf

        float viewStart = row.getTranslationY();

        int fullHeight = row.getActualHeight() + mPaddingBetweenElements;
@@ -310,12 +315,13 @@ public class NotificationShelf extends ActivatableNotificationView { 
            fullTransitionAmount = 0.0f;

            iconTransitionAmount = 0.0f;

        }

        updateIconPositioning(row, iconTransitionAmount, fullTransitionAmount, isLastChild);

        updateIconPositioning(row, iconTransitionAmount, fullTransitionAmount, scrollingFast,

                isLastChild);

        return fullTransitionAmount;

    }



    private void updateIconPositioning(ExpandableNotificationRow row, float iconTransitionAmount,

            float fullTransitionAmount, boolean isLastChild) {

            float fullTransitionAmount, boolean scrollingFast, boolean isLastChild) {

        StatusBarIconView icon = row.getEntry().expandedIcon;

        NotificationIconContainer.IconState iconState = getIconState(icon);

        if (iconState == null) {
@@ -326,7 +332,7 @@ public class NotificationShelf extends ActivatableNotificationView { 
            iconState.keepClampedPosition = false;

        }

        if (clampedAmount == fullTransitionAmount) {

            iconState.useFullTransitionAmount = fullTransitionAmount == 0.0f;

            iconState.useFullTransitionAmount = fullTransitionAmount == 0.0f || scrollingFast;

            iconState.translateContent = mMaxLayoutHeight - getTranslationY()

                    - getIntrinsicHeight() > 0;

        }

packages/SystemUI/src/com/android/systemui/statusbar/stack/AmbientState.java

+9 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public class AmbientState { 
    private int mBaseZHeight;

    private int mMaxLayoutHeight;

    private ActivatableNotificationView mLastVisibleBackgroundChild;

    private float mCurrentScrollVelocity;



    public AmbientState(Context context) {

        reload(context);
@@ -241,4 +242,12 @@ public class AmbientState { 
    public ActivatableNotificationView getLastVisibleBackgroundChild() {

        return mLastVisibleBackgroundChild;

    }



    public void setCurrentScrollVelocity(float currentScrollVelocity) {

        mCurrentScrollVelocity = currentScrollVelocity;

    }



    public float getCurrentScrollVelocity() {

        return mCurrentScrollVelocity;

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+3 −0
Original line number Diff line number Diff line
@@ -575,6 +575,9 @@ public class NotificationStackScrollLayout extends ViewGroup 
     */

    private void updateChildren() {

        updateScrollStateForAddedChildren();

        mAmbientState.setCurrentScrollVelocity(mScroller.isFinished()

                ? 0

                : mScroller.getCurrVelocity());

        mAmbientState.setScrollY(mOwnScrollY);

        mStackScrollAlgorithm.getStackScrollState(mAmbientState, mCurrentStackScrollState);

        if (!isCurrentlyAnimating() && !mNeedsAnimation) {