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

Commit b8b0dfe4 authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

Merge "Fix extra padding when there are no static notification dots" into pi-dev 

am: bb9bd121

Change-Id: I10265707ea93b4518088b9f10ce4a1007a731108
parents ee28e9e1 bb9bd121

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java

+2 −2
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ public class NotificationIconContainer extends AlphaOptimizedFrameLayout { 
            return 0;

        }



        int partialOverflowAmount = (MAX_DOTS - mNumDots) * (mStaticDotRadius * 2 + mDotPadding);

        int partialOverflowAmount = (MAX_DOTS - mNumDots) * (mStaticDotDiameter + mDotPadding);



        int adjustedWidth = getFinalTranslationX() + partialOverflowAmount;

        // In case we actually give too much padding...
@@ -542,7 +542,7 @@ public class NotificationIconContainer extends AlphaOptimizedFrameLayout { 
            return 0;

        }



        int collapsedPadding = (int) ((1.0f + OVERFLOW_EARLY_AMOUNT) * getIconSize());

        int collapsedPadding = mIconSize + 2 * (mStaticDotDiameter + mDotPadding);



        if (collapsedPadding + getFinalTranslationX() > getWidth()) {

            collapsedPadding = getWidth() - getFinalTranslationX();