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

This commit is contained in:
Lyn Han
2020-03-16 17:34:26 +00:00
committed by Android (Google) Code Review

View File

@@ -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