Merge "Render to measured size when using expand mode" into lmp-mr1-dev (7720eb18) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -523,6 +523,11 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
		if (neededWidth > measuredWidth) {
		mMeasuredScreenWidth += neededWidth - measuredWidth;
		}
		if (mMeasuredScreenWidth < measuredWidth) {
		// If the screen width is less than the exact measured width,
		// expand to match.
		mMeasuredScreenWidth = measuredWidth;
		}
		}

		if (renderingMode.isVertExpand()) {
		@@ -531,6 +536,11 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
		if (neededHeight > measuredHeight) {
		mMeasuredScreenHeight += neededHeight - measuredHeight;
		}
		if (mMeasuredScreenHeight < measuredHeight) {
		// If the screen height is less than the exact measured height,
		// expand to match.
		mMeasuredScreenHeight = measuredHeight;
		}
		}
		}
		}

+79 B (598 B)

File changed.

No diff preview for this file type.

0 → 100644

+636 B

Loading image diff...

0 → 100644

+578 B

Loading image diff...

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:padding="16dp"
		android:orientation="horizontal"
		android:background="#AAAAAA"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content">

		<include layout="@layout/expand_layout"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content" />

		</LinearLayout>