diff options
| author | 2016-05-03 18:19:41 +0000 | |
|---|---|---|
| committer | 2016-05-03 18:19:42 +0000 | |
| commit | 344d23c0fadd9714453a2bfdebf1d1b304105acf (patch) | |
| tree | 8a95b12d4aaf50d37899bd96dd79bb80ce8cd055 | |
| parent | 28309fec2f104e181c22ab03ba3cec7f8756e4b7 (diff) | |
| parent | 0780f3a0733ea8ff4e8a93ca1263d92e24a6e9bb (diff) | |
Merge "Fix FloatingToolbar popup positioning." into nyc-dev
| -rw-r--r-- | core/java/com/android/internal/widget/FloatingToolbar.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/com/android/internal/widget/FloatingToolbar.java b/core/java/com/android/internal/widget/FloatingToolbar.java index bc12391a2f79..8cc850970891 100644 --- a/core/java/com/android/internal/widget/FloatingToolbar.java +++ b/core/java/com/android/internal/widget/FloatingToolbar.java @@ -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()); |