Merge "Add better error message when fold bounds are incorrect." into udc-qpr-dev (ca108697) · Commits · e / os / android_frameworks_base

libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java

+25 −3

Original line number	Diff line number	Diff line
		@@ -336,10 +336,32 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent {
		rotateRectToDisplayRotation(displayId, featureRect);
		transformToWindowSpaceRect(windowConfiguration, featureRect);

		if (!isZero(featureRect)) {
		if (isZero(featureRect)) {
		// TODO(b/228641877): Remove guarding when fixed.
		features.add(new FoldingFeature(featureRect, baseFeature.getType(), state));
		continue;
		}
		if (featureRect.left != 0 && featureRect.top != 0) {
		throw new IllegalArgumentException("Bounding rectangle must start at the top or "
		+ "left of the window. BaseFeatureRect: " + baseFeature.getRect()
		+ ", FeatureRect: " + featureRect
		+ ", WindowConfiguration: " + windowConfiguration);

		}
		if (featureRect.left == 0
		&& featureRect.width() != windowConfiguration.getBounds().width()) {
		throw new IllegalArgumentException("Horizontal FoldingFeature must have full width."
		+ " BaseFeatureRect: " + baseFeature.getRect()
		+ ", FeatureRect: " + featureRect
		+ ", WindowConfiguration: " + windowConfiguration);
		}
		if (featureRect.top == 0
		&& featureRect.height() != windowConfiguration.getBounds().height()) {
		throw new IllegalArgumentException("Vertical FoldingFeature must have full height."
		+ " BaseFeatureRect: " + baseFeature.getRect()
		+ ", FeatureRect: " + featureRect
		+ ", WindowConfiguration: " + windowConfiguration);
		}
		features.add(new FoldingFeature(featureRect, baseFeature.getType(), state));
		}
		return features;
		}