Merge "Fix DatePicker rendering." into lmp-dev (f9bb0b5e) · Commits · e / os / android_frameworks_base

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

+18 −10

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ import android.view.DisplayAdjustments;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.WindowManager;
		import android.view.accessibility.AccessibilityManager;
		import android.view.textservice.TextServicesManager;

		import java.io.File;
		@@ -476,6 +477,10 @@ public final class BridgeContext extends Context {
		return mDisplayManager;
		}

		if (ACCESSIBILITY_SERVICE.equals(service)) {
		return AccessibilityManager.getInstance(this);
		}

		throw new UnsupportedOperationException("Unsupported Service: " + service);
		}

		@@ -491,8 +496,10 @@ public final class BridgeContext extends Context {
		@Override
		public final BridgeTypedArray obtainStyledAttributes(int resid, int[] attrs)
		throws Resources.NotFoundException {
		StyleResourceValue style = null;
		// get the StyleResourceValue based on the resId;
		StyleResourceValue style = getStyleByDynamicId(resid);
		if (resid != 0) {
		style = getStyleByDynamicId(resid);

		if (style == null) {
		// In some cases, style may not be a dynamic id, so we do a full search.
		@@ -505,6 +512,7 @@ public final class BridgeContext extends Context {
		if (style == null) {
		throw new Resources.NotFoundException();
		}
		}

		if (mTypedArrayCache == null) {
		mTypedArrayCache = new HashMap<int[], Map<Integer,BridgeTypedArray>>();