Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix DatePicker rendering." into lmp-dev

Browse Source
This commit is contained in:
Deepanshu Gupta
2015-01-05 23:23:31 +00:00
committed by Android (Google) Code Review
parent d20a518c82 e64a5bd2fb
commit f9bb0b5e13
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
View File

@@ -73,6 +73,7 @@ import android.view.DisplayAdjustments;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.accessibility.AccessibilityManager;
import android.view.textservice.TextServicesManager; import android.view.textservice.TextServicesManager;
import java.io.File; import java.io.File;
@@ -476,6 +477,10 @@ public final class BridgeContext extends Context {
return mDisplayManager; return mDisplayManager;
} }
if (ACCESSIBILITY_SERVICE.equals(service)) {
return AccessibilityManager.getInstance(this);
}
throw new UnsupportedOperationException("Unsupported Service: " + service); throw new UnsupportedOperationException("Unsupported Service: " + service);
} }
@@ -491,8 +496,10 @@ public final class BridgeContext extends Context {
@Override @Override
public final BridgeTypedArray obtainStyledAttributes(int resid, int[] attrs) public final BridgeTypedArray obtainStyledAttributes(int resid, int[] attrs)
throws Resources.NotFoundException { throws Resources.NotFoundException {
StyleResourceValue style = null;
// get the StyleResourceValue based on the resId; // get the StyleResourceValue based on the resId;
StyleResourceValue style = getStyleByDynamicId(resid); if (resid != 0) {
style = getStyleByDynamicId(resid);
if (style == null) { if (style == null) {
// In some cases, style may not be a dynamic id, so we do a full search. // 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) { if (style == null) {
throw new Resources.NotFoundException(); throw new Resources.NotFoundException();
} }
}
if (mTypedArrayCache == null) { if (mTypedArrayCache == null) {
mTypedArrayCache = new HashMap<int[], Map<Integer,BridgeTypedArray>>(); mTypedArrayCache = new HashMap<int[], Map<Integer,BridgeTypedArray>>();