Merge "Take RTL layouts into account for bounding rect alignment" into main (a28cd2ca) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java

+15 −3

Original line number	Diff line number	Diff line
		@@ -600,15 +600,27 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer>

		private Rect calculateBoundingRectLocal(@NonNull OccludingCaptionElement element,
		int elementWidthPx, @NonNull Rect captionRect) {
		final boolean isRtl =
		mDecorWindowContext.getResources().getConfiguration().getLayoutDirection()
		== View.LAYOUT_DIRECTION_RTL;
		switch (element.mAlignment) {
		case START -> {
		if (isRtl) {
		return new Rect(captionRect.width() - elementWidthPx, 0,
		captionRect.width(), captionRect.height());
		} else {
		return new Rect(0, 0, elementWidthPx, captionRect.height());
		}
		}
		case END -> {
		if (isRtl) {
		return new Rect(0, 0, elementWidthPx, captionRect.height());
		} else {
		return new Rect(captionRect.width() - elementWidthPx, 0,
		captionRect.width(), captionRect.height());
		}
		}
		}
		throw new IllegalArgumentException("Unexpected alignment " + element.mAlignment);
		}