Merge "Fix the layoutlib to still support fill_parent." (be896a9b) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -927,6 +927,7 @@ public final class BridgeContext extends Context {
		return null;
		}

		@Override
		public File getExternalCacheDir() {
		// TODO Auto-generated method stub
		return null;
		@@ -964,6 +965,7 @@ public final class BridgeContext extends Context {
		return null;
		}

		@Override
		public File getExternalFilesDir(String type) {
		// TODO Auto-generated method stub
		return null;

+4 −2

Original line number	Diff line number	Diff line
		@@ -392,7 +392,8 @@ public final class BridgeTypedArray extends TypedArray {

		if (s == null) {
		return defValue;
		} else if (s.equals(BridgeConstants.MATCH_PARENT)) {
		} else if (s.equals(BridgeConstants.MATCH_PARENT) \|\|
		s.equals(BridgeConstants.FILL_PARENT)) {
		return LayoutParams.MATCH_PARENT;
		} else if (s.equals(BridgeConstants.WRAP_CONTENT)) {
		return LayoutParams.WRAP_CONTENT;
		@@ -460,7 +461,8 @@ public final class BridgeTypedArray extends TypedArray {

		if (s == null) {
		return defValue;
		} else if (s.equals(BridgeConstants.MATCH_PARENT)) {
		} else if (s.equals(BridgeConstants.MATCH_PARENT) \|\|
		s.equals(BridgeConstants.FILL_PARENT)) {
		return LayoutParams.MATCH_PARENT;
		} else if (s.equals(BridgeConstants.WRAP_CONTENT)) {
		return LayoutParams.WRAP_CONTENT;