Merge "ImageSwitcher -> ImageView in appcompat inflate"
diff --git a/bridge/src/android/content/res/BridgeTypedArray.java b/bridge/src/android/content/res/BridgeTypedArray.java
index 1d5ac0c..9da65a6 100644
--- a/bridge/src/android/content/res/BridgeTypedArray.java
+++ b/bridge/src/android/content/res/BridgeTypedArray.java
@@ -638,7 +638,15 @@
}
}
- // not a direct id valid reference? resolve it
+ // not a direct id valid reference. First check if it's an enum (this is a corner case
+ // for attributes that have a reference|enum type), then fallback to resolve
+ // as an ID without prefix.
+ Integer enumValue = resolveEnumAttribute(index);
+ if (enumValue != null) {
+ return enumValue;
+ }
+
+ // Ok, not an enum, resolve as an ID
Integer idValue;
if (resValue.isFramework()) {
diff --git a/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java b/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java
index cef622b..b3ed9e1 100644
--- a/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java
+++ b/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java
@@ -712,11 +712,6 @@
}
@Override
- public void setComponentEnabledSettingAsUser(ComponentName componentName, int newState,
- int flags, int userId) {
- }
-
- @Override
public int getComponentEnabledSetting(ComponentName componentName) {
return 0;
}
@@ -726,11 +721,6 @@
}
@Override
- public void setApplicationEnabledSettingAsUser(String packageName, int newState, int flags,
- int userId) {
- }
-
- @Override
public int getApplicationEnabledSetting(String packageName) {
return 0;
}