Merge "Fix FloatingToolbar popup positioning." into nyc-dev (344d23c0) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/FloatingToolbar.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -909,8 +909,8 @@ public final class FloatingToolbar {
		mOverflowPanel.setX(0); // align left
		} else {
		mContentContainer.setX( // align right
		mMarginHorizontal +
		mMainPanelSize.getWidth() - containerSize.getWidth());
		mPopupWindow.getWidth() -
		containerSize.getWidth() - mMarginHorizontal);
		mMainPanel.setX(-mContentContainer.getX()); // align right
		mOverflowButton.setX(0); // align left
		mOverflowPanel.setX(0); // align left
		@@ -949,7 +949,9 @@ public final class FloatingToolbar {
		mOverflowButton.setX(0); // align left
		mOverflowPanel.setX(0); // align left
		} else {
		mContentContainer.setX(mMarginHorizontal); // align left
		mContentContainer.setX( // align right
		mPopupWindow.getWidth() -
		containerSize.getWidth() - mMarginHorizontal);
		mMainPanel.setX(0); // align left
		mOverflowButton.setX( // align right
		containerSize.getWidth() - mOverflowButtonSize.getWidth());