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

Commit 7f96551b authored by Kazuhiro Inaba's avatar Kazuhiro Inaba Committed by Android (Google) Code Review
Browse files

Merge "Cap minimum visibilty of floating windows by the real size." into nyc-mr1-dev

parents 3a9923d7 ad0f7793

services/core/java/com/android/server/wm/WindowState.java

+4 −4
Original line number Diff line number Diff line
@@ -829,10 +829,10 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
            final int height = Math.min(mFrame.height(), mContentFrame.height());

            final int width = Math.min(mContentFrame.width(), mFrame.width());

            final DisplayMetrics displayMetrics = getDisplayContent().getDisplayMetrics();

            final int minVisibleHeight = WindowManagerService.dipToPixel(

                    MINIMUM_VISIBLE_HEIGHT_IN_DP, displayMetrics);

            final int minVisibleWidth = WindowManagerService.dipToPixel(

                    MINIMUM_VISIBLE_WIDTH_IN_DP, displayMetrics);

            final int minVisibleHeight = Math.min(height, WindowManagerService.dipToPixel(

                    MINIMUM_VISIBLE_HEIGHT_IN_DP, displayMetrics));

            final int minVisibleWidth = Math.min(width, WindowManagerService.dipToPixel(

                    MINIMUM_VISIBLE_WIDTH_IN_DP, displayMetrics));

            final int top = Math.max(mContentFrame.top,

                    Math.min(mFrame.top, mContentFrame.bottom - minVisibleHeight));

            final int left = Math.max(mContentFrame.left + minVisibleWidth - width,