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

Commit 88502ffd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Restore landscape spacing post frameworks fix" into rvc-dev am: a05598dc 

Change-Id: Ifa1c4fb9aef4c0479600f3ffdc142d1f5b8423df
parents 2695e109 a05598dc

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

+2 −5
Original line number Diff line number Diff line
@@ -409,11 +409,8 @@ public class ExpandedAnimationController 
        mBubblesMaxRendered = res.getInteger(R.integer.bubbles_max_rendered);



        // Includes overflow button.

        // TODO(b/148675523) this is a temporary work around; change back once we have proper fix.

//        float totalGapWidth = getWidthForDisplayingBubbles() - (mExpandedViewPadding * 2)

//                - (mBubblesMaxRendered + 1) * mBubbleSizePx;

        float totalGapWidth = getAvailableScreenWidth(true /* includeStableInsets */)

                - (mExpandedViewPadding * 2) - (mBubblesMaxRendered + 1) * mBubbleSizePx;

        float totalGapWidth = getWidthForDisplayingBubbles() - (mExpandedViewPadding * 2)

                - (mBubblesMaxRendered + 1) * mBubbleSizePx;

        mSpaceBetweenBubbles = totalGapWidth / mBubblesMaxRendered;



        // Ensure that all child views are at 1x scale, and visible, in case they were animating