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

am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

Browse Source 
* commit '678f0ea2ba47f06387670e9f75b13637a6446899':
  Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2015-08-26 20:18:34 +00:00
committed by Android Git Automerger
parent d6363d8606 678f0ea2ba
commit 6b7f9ae6f5
1 changed files with 32 additions and 26 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

@@ -66,7 +66,9 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.Parcel;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.RemoteException;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
@@ -679,6 +681,10 @@ public final class BridgeContext extends Context {
} }
} }
} else if (defStyleRes != 0) { } else if (defStyleRes != 0) {
StyleResourceValue item = mDynamicIdToStyleMap.get(defStyleRes);
if (item != null) {
defStyleValues = item;
} else {
boolean isFrameworkRes = true; boolean isFrameworkRes = true;
Pair<ResourceType, String> value = Bridge.resolveResourceId(defStyleRes); Pair<ResourceType, String> value = Bridge.resolveResourceId(defStyleRes);
if (value == null) { if (value == null) {
@@ -689,8 +695,7 @@ public final class BridgeContext extends Context {
if (value != null) { if (value != null) {
if ((value.getFirst() == ResourceType.STYLE)) { if ((value.getFirst() == ResourceType.STYLE)) {
// look for the style in all resources: // look for the style in all resources:
StyleResourceValue item = mRenderResources.getStyle(value.getSecond(), item = mRenderResources.getStyle(value.getSecond(), isFrameworkRes);
isFrameworkRes);
if (item != null) { if (item != null) {
if (defaultPropMap != null) { if (defaultPropMap != null) {
defaultPropMap.put("style", item.getName()); defaultPropMap.put("style", item.getName());
@@ -719,6 +724,7 @@ public final class BridgeContext extends Context {
null); null);
} }
} }
}
String appNamespace = mLayoutlibCallback.getNamespace(); String appNamespace = mLayoutlibCallback.getNamespace();