Merge "Fix PopupWindow's wrong location" into rvc-dev am: 4f4706de1f am:... (0aa490c1) · Commits · e / os / android_frameworks_base

core/java/android/widget/PopupWindow.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1818,7 +1818,7 @@ public class PopupWindow {
	final int winOffsetY = screenLocationY - drawingLocationY;		final int winOffsetY = screenLocationY - drawingLocationY;
	final int anchorTopInScreen = outParams.y + winOffsetY;		final int anchorTopInScreen = outParams.y + winOffsetY;
	final int spaceBelow = displayFrameBottom - anchorTopInScreen;		final int spaceBelow = displayFrameBottom - anchorTopInScreen;
	if (anchorTopInScreen >= 0 && height <= spaceBelow) {		if (anchorTopInScreen >= displayFrameTop && height <= spaceBelow) {
	return true;		return true;
	}		}

	@@ -1880,7 +1880,7 @@ public class PopupWindow {
	final int winOffsetX = screenLocationX - drawingLocationX;		final int winOffsetX = screenLocationX - drawingLocationX;
	final int anchorLeftInScreen = outParams.x + winOffsetX;		final int anchorLeftInScreen = outParams.x + winOffsetX;
	final int spaceRight = displayFrameRight - anchorLeftInScreen;		final int spaceRight = displayFrameRight - anchorLeftInScreen;
	if (anchorLeftInScreen >= 0 && width <= spaceRight) {		if (anchorLeftInScreen >= displayFrameLeft && width <= spaceRight) {
	return true;		return true;
	}		}