Merge "Consistent portrait/landscape spacing"

This commit is contained in:
TreeHugger Robot
2020-02-05 02:02:06 +00:00
committed by Android (Google) Code Review

View File

@@ -388,8 +388,11 @@ public class ExpandedAnimationController
mBubblesMaxRendered = res.getInteger(R.integer.bubbles_max_rendered);
// Includes overflow button.
float totalGapWidth = getWidthForDisplayingBubbles() - (mExpandedViewPadding * 2)
- (mBubblesMaxRendered + 1) * mBubbleSizePx;
// 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;
mSpaceBetweenBubbles = totalGapWidth / mBubblesMaxRendered;
// Ensure that all child views are at 1x scale, and visible, in case they were animating