resolved conflicts for merge of 112d8a36 to mnc-dev (b9935889) · 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
		@@ -526,6 +526,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()) {
		@@ -534,6 +539,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;
		}
		}
		}
		}