am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '363f4d4e2a53774b7b7c1ea995fc912291f5b84e':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
index 736d2fa..d32af41 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -630,10 +630,15 @@
defStyleRes, value.getSecond()),
null /*data*/);
}
+ } else if (value.getFirst() == ResourceType.ATTR) {
+ // Ignore. There's a bug in the framework where sometimes defStyleAttr ends up
+ // in defStyleRes. The framework ignores the attribute when it's not a style.
+ // But to let the developers find bugs in their code, we log an error for other
+ // cases.
} else {
- Bridge.getLog().error(null,
+ Bridge.getLog().warning(null,
String.format(
- "Resouce id 0x%x is not of type STYLE (instead %s)",
+ "Resource id 0x%x is not of type STYLE (instead %s)",
defStyleRes, value.getFirst().toString()),
null /*data*/);
}