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

am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev

Browse Source 
* commit 'e69e4f8b4db142f024e170cf6faabb36095799b7':
  Fix DatePicker rendering.
This commit is contained in:
Deepanshu Gupta
2015-01-06 22:22:49 +00:00
committed by Android Git Automerger
parent 48ab6becea e69e4f8b4d
commit b187106c53
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,6 +74,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;
@@ -477,6 +478,10 @@ public final class BridgeContext extends Context {
return mDisplayManager;
}
if (ACCESSIBILITY_SERVICE.equals(service)) {
return AccessibilityManager.getInstance(this);
}
throw new UnsupportedOperationException("Unsupported Service: " + service);
}
@@ -492,19 +497,22 @@ 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.
ResourceReference ref = resolveId(resid);
if (ref != null) {
style = mRenderResources.getStyle(ref.getName(), ref.isFramework());
if (style == null) {
// In some cases, style may not be a dynamic id, so we do a full search.
ResourceReference ref = resolveId(resid);
if (ref != null) {
style = mRenderResources.getStyle(ref.getName(), ref.isFramework());
}
}
}
if (style == null) {
throw new Resources.NotFoundException();
if (style == null) {
throw new Resources.NotFoundException();
}
}
if (mTypedArrayCache == null) {