am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1 (b18e700c) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java

+2 −10

Original line number	Diff line number	Diff line
		@@ -201,7 +201,8 @@ public final class Bridge extends com.android.ide.common.rendering.api.Bridge {
		Capability.VIEW_MANIPULATION,
		Capability.PLAY_ANIMATION,
		Capability.ANIMATED_VIEW_MANIPULATION,
		Capability.ADAPTER_BINDING);
		Capability.ADAPTER_BINDING,
		Capability.EXTENDED_VIEWINFO);


		BridgeAssetManager.initSystem();
		@@ -399,15 +400,6 @@ public final class Bridge extends com.android.ide.common.rendering.api.Bridge {
		throw new IllegalArgumentException("viewObject is not a View");
		}

		@Override
		public int getViewBaseline(Object viewObject) {
		if (viewObject instanceof View) {
		return ((View) viewObject).getBaseline();
		}

		throw new IllegalArgumentException("viewObject is not a View");
		}

		/**
		* Returns the lock for the bridge
		*/

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/MockView.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.layoutlib.bridge;
		import android.content.Context;
		import android.graphics.Canvas;
		import android.util.AttributeSet;
		import android.view.Gravity;
		import android.widget.TextView;

		/**
		@@ -34,6 +35,7 @@ public class MockView extends TextView {

		setText(this.getClass().getSimpleName());
		setTextColor(0xFF000000);
		setGravity(Gravity.CENTER);
		}

		@Override

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

+26 −8

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ import android.view.ViewGroup;
		import android.view.View.AttachInfo;
		import android.view.View.MeasureSpec;
		import android.view.ViewGroup.LayoutParams;
		import android.view.ViewGroup.MarginLayoutParams;
		import android.widget.AbsListView;
		import android.widget.AbsSpinner;
		import android.widget.AdapterView;
		@@ -513,7 +514,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
		mViewRoot.draw(mCanvas);
		}

		mViewInfoList = startVisitingViews(mViewRoot, 0);
		mViewInfoList = startVisitingViews(mViewRoot, 0, params.getExtendedViewInfoMode());

		// success!
		return SUCCESS.createResult();
		@@ -1255,7 +1256,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
		}
		}

		private List<ViewInfo> startVisitingViews(View view, int offset) {
		private List<ViewInfo> startVisitingViews(View view, int offset, boolean setExtendedInfo) {
		if (view == null) {
		return null;
		}
		@@ -1264,7 +1265,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
		offset += view.getTop();

		if (view == mContentRoot) {
		return visitAllChildren(mContentRoot, offset);
		return visitAllChildren(mContentRoot, offset, setExtendedInfo);
		}

		// otherwise, look for mContentRoot in the children
		@@ -1272,7 +1273,8 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
		ViewGroup group = ((ViewGroup) view);

		for (int i = 0; i < group.getChildCount(); i++) {
		List<ViewInfo> list = startVisitingViews(group.getChildAt(i), offset);
		List<ViewInfo> list = startVisitingViews(group.getChildAt(i), offset,
		setExtendedInfo);
		if (list != null) {
		return list;
		}
		@@ -1287,8 +1289,9 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
		* bounds of all the views.
		* @param view the root View
		* @param offset an offset for the view bounds.
		* @param setExtendedInfo whether to set the extended view info in the {@link ViewInfo} object.
		*/
		private ViewInfo visit(View view, int offset) {
		private ViewInfo visit(View view, int offset, boolean setExtendedInfo) {
		if (view == null) {
		return null;
		}
		@@ -1298,9 +1301,22 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
		view.getLeft(), view.getTop() + offset, view.getRight(), view.getBottom() + offset,
		view, view.getLayoutParams());

		if (setExtendedInfo) {
		MarginLayoutParams marginParams = null;
		LayoutParams params = view.getLayoutParams();
		if (params instanceof MarginLayoutParams) {
		marginParams = (MarginLayoutParams) params;
		}
		result.setExtendedInfo(view.getBaseline(),
		marginParams != null ? marginParams.leftMargin : 0,
		marginParams != null ? marginParams.topMargin : 0,
		marginParams != null ? marginParams.rightMargin : 0,
		marginParams != null ? marginParams.bottomMargin : 0);
		}

		if (view instanceof ViewGroup) {
		ViewGroup group = ((ViewGroup) view);
		result.setChildren(visitAllChildren(group, 0 /offset/));
		result.setChildren(visitAllChildren(group, 0 /offset/, setExtendedInfo));
		}

		return result;
		@@ -1311,15 +1327,17 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
		* containing the bounds of all the views.
		* @param view the root View
		* @param offset an offset for the view bounds.
		* @param setExtendedInfo whether to set the extended view info in the {@link ViewInfo} object.
		*/
		private List<ViewInfo> visitAllChildren(ViewGroup viewGroup, int offset) {
		private List<ViewInfo> visitAllChildren(ViewGroup viewGroup, int offset,
		boolean setExtendedInfo) {
		if (viewGroup == null) {
		return null;
		}

		List<ViewInfo> children = new ArrayList<ViewInfo>();
		for (int i = 0; i < viewGroup.getChildCount(); i++) {
		children.add(visit(viewGroup.getChildAt(i), offset));
		children.add(visit(viewGroup.getChildAt(i), offset, setExtendedInfo));
		}
		return children;
		}