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

Commit c2cd9cca authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by android-build-merger
Browse files

Merge "Ensure FloatingToolbar is not rendered at negative x, y coordinates." into nyc-dev 

am: d971a9d5

* commit 'd971a9d5':
  Ensure FloatingToolbar is not rendered at negative x, y coordinates.

Change-Id: I2db5a9b674c0319b7c07a18ee763fcc1d90da7ea
parents 9d94734a d971a9d5

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

+7 −4
Original line number Diff line number Diff line
@@ -592,9 +592,11 @@ public final class FloatingToolbar { 
        private void refreshCoordinatesAndOverflowDirection(Rect contentRectOnScreen) {

            refreshViewPort();



            int x = contentRectOnScreen.centerX() - mPopupWindow.getWidth() / 2;

            // Update x so that the toolbar isn't rendered behind the nav bar in landscape.

            x = Math.max(0, Math.min(x, mViewPortOnScreen.right - mPopupWindow.getWidth()));

            // Initialize x ensuring that the toolbar isn't rendered behind the nav bar in

            // landscape.

            final int x = Math.min(

                    contentRectOnScreen.centerX() - mPopupWindow.getWidth() / 2,

                    mViewPortOnScreen.right - mPopupWindow.getWidth());



            final int y;
@@ -684,7 +686,8 @@ public final class FloatingToolbar { 
            int rootViewTopOnWindow = mTmpCoords[1];

            int windowLeftOnScreen = rootViewLeftOnScreen - rootViewLeftOnWindow;

            int windowTopOnScreen = rootViewTopOnScreen - rootViewTopOnWindow;

            mCoordsOnWindow.set(x - windowLeftOnScreen, y - windowTopOnScreen);

            mCoordsOnWindow.set(

                    Math.max(0, x - windowLeftOnScreen), Math.max(0, y - windowTopOnScreen));

        }



        /**