Merge "Layoutlib: Fill the default prop value map for View objects." (cea3a1cc) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import com.android.layoutlib.api.ViewInfo;
		import com.android.layoutlib.bridge.impl.LayoutSceneImpl;

		import java.awt.image.BufferedImage;
		import java.util.Map;

		/**
		* An implementation of {@link LayoutScene}.
		@@ -51,6 +52,11 @@ public class BridgeLayoutScene extends LayoutScene {
		return mScene.getViewInfo();
		}

		@Override
		public Map<String, String> getDefaultViewPropertyValues(Object viewObject) {
		return mScene.getDefaultViewPropertyValues(viewObject);
		}

		@Override
		public SceneResult render() {

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

+21 −27

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ import java.io.FileOutputStream;
		import java.io.IOException;
		import java.io.InputStream;
		import java.util.HashMap;
		import java.util.IdentityHashMap;
		import java.util.Map;
		import java.util.TreeMap;
		import java.util.Map.Entry;
		@@ -82,6 +83,9 @@ public final class BridgeContext extends Activity {
		private final Map<String, Map<String, IResourceValue>> mFrameworkResources;
		private final Map<IStyleResourceValue, IStyleResourceValue> mStyleInheritanceMap;

		private final Map<Object, Map<String, String>> mDefaultPropMaps =
		new IdentityHashMap<Object, Map<String,String>>();

		// maps for dynamically generated id representing style objects (IStyleResourceValue)
		private Map<Integer, IStyleResourceValue> mDynamicIdToStyleMap;
		private Map<IStyleResourceValue, Integer> mStyleToDynamicIdMap;
		@@ -180,6 +184,9 @@ public final class BridgeContext extends Activity {
		return mLogger;
		}

		public Map<String, String> getDefaultPropMap(Object key) {
		return mDefaultPropMaps.get(key);
		}

		// ------------- Activity Methods

		@@ -285,13 +292,16 @@ public final class BridgeContext extends Activity {
		return null;
		}

		Object key = null;
		Map<String, String> defaultPropMap = null;
		if (parser != null) {
		key = parser.getViewKey();
		}
		Object key = parser.getViewKey();
		if (key != null) {
		String attrs_name = Bridge.resolveResourceValue(attrs);
		System.out.println("KEY: " + key.toString() + "(" + attrs_name + ")");
		defaultPropMap = mDefaultPropMaps.get(key);
		if (defaultPropMap == null) {
		defaultPropMap = new HashMap<String, String>();
		mDefaultPropMaps.put(key, defaultPropMap);
		}
		}
		}

		boolean[] frameworkAttributes = new boolean[1];
		@@ -309,9 +319,6 @@ public final class BridgeContext extends Activity {
		customStyle = parser.getAttributeValue(null /* namespace*/, "style");
		}
		if (customStyle != null) {
		if (key != null) {
		print("style", customStyle, false);
		}
		IResourceValue item = findResValue(customStyle, false /forceFrameworkOnly/);

		if (item instanceof IStyleResourceValue) {
		@@ -323,8 +330,8 @@ public final class BridgeContext extends Activity {
		// get the name from the int.
		String defStyleName = searchAttr(defStyleAttr);

		if (key != null) {
		print("style", defStyleName, true);
		if (defaultPropMap != null) {
		defaultPropMap.put("style", defStyleName);
		}

		// look for the style in the current theme, and its parent:
		@@ -385,20 +392,16 @@ public final class BridgeContext extends Activity {
		// if we found a value, we make sure this doesn't reference another value.
		// So we resolve it.
		if (resValue != null) {
		if (key != null) {
		print(name, resValue.getValue(), true);
		// put the first default value, before the resolution.
		if (defaultPropMap != null) {
		defaultPropMap.put(name, resValue.getValue());
		}

		resValue = resolveResValue(resValue);
		} else if (key != null) {
		print(name, "<unknown>", true);
		}

		ta.bridgeSetValue(index, name, resValue);
		} else {
		if (key != null) {
		print(name, value, false);
		}
		// there is a value in the XML, but we need to resolve it in case it's
		// referencing another resource or a theme value.
		ta.bridgeSetValue(index, name, resolveValue(null, name, value));
		@@ -411,15 +414,6 @@ public final class BridgeContext extends Activity {
		return ta;
		}

		private void print(String name, String value, boolean isDefault) {
		System.out.print("\t" + name + " : " + value);
		if (isDefault) {
		System.out.println(" (default)");
		} else {
		System.out.println("");
		}
		}

		@Override
		public Looper getMainLooper() {
		return Looper.myLooper();

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -665,7 +665,8 @@ public class LayoutSceneImpl {

		ViewInfo result = new ViewInfo(view.getClass().getName(),
		context.getViewKey(view),
		view.getLeft(), view.getTop(), view.getRight(), view.getBottom());
		view.getLeft(), view.getTop(), view.getRight(), view.getBottom(),
		view, view.getLayoutParams());

		if (view instanceof ViewGroup) {
		ViewGroup group = ((ViewGroup) view);
		@@ -686,4 +687,8 @@ public class LayoutSceneImpl {
		public ViewInfo getViewInfo() {
		return mViewInfo;
		}

		public Map<String, String> getDefaultViewPropertyValues(Object viewObject) {
		return mContext.getDefaultPropMap(viewObject);
		}
		}