Merge "Stopgap fix for layoutlib." into lmp-preview-dev (7ee26070) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -826,6 +826,11 @@ public final class BridgeTypedArray extends TypedArray {
		return null;
		}

		@Override
		public int[] extractThemeAttrs() {
		return null;
		}

		/**
		* Retrieve the raw TypedValue for the attribute at <var>index</var>.
		*
		@@ -912,4 +917,9 @@ public final class BridgeTypedArray extends TypedArray {
		public String toString() {
		return Arrays.toString(mResourceData);
		}

		static TypedArray obtain(Resources res, int len) {
		return res instanceof BridgeResources ?
		new BridgeTypedArray(((BridgeResources) res), null, len, true) : null;
		}
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ public class TypedArray_Delegate {

		@LayoutlibDelegate
		/package/ static TypedArray obtain(Resources res, int len) {
		// FIXME
		return null;
		return BridgeTypedArray.obtain(res, len);
		}
		}