commit 014168eda4ecd62d12224dba1c58720b31934bb6
author Diego Perez <diegoperez@google.com> Thu Aug 04 16:54:12 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 04 16:54:13 2016 +0000
tree 941dfe0dfe09abc6d781b33bbb03aca92e10e466
parent 1962900a77f843187cf99163ccbba5e6b89e8b47
parent f19c8542f083e7751596532463e891cd8f5bd199

Merge "Implement missing getAssignedPackageIdentifiers delegate"

bridge/src/android/content/res/BridgeTypedArray.java

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()) {

bridge/src/android/view/BridgeInflater.java

diff --git a/bridge/src/android/view/BridgeInflater.java b/bridge/src/android/view/BridgeInflater.java
index 1f72106..b19cb58 100644
--- a/bridge/src/android/view/BridgeInflater.java
+++ b/bridge/src/android/view/BridgeInflater.java
@@ -55,6 +55,7 @@
 import static com.android.SdkConstants.CHECK_BOX;
 import static com.android.SdkConstants.EDIT_TEXT;
 import static com.android.SdkConstants.IMAGE_BUTTON;
+import static com.android.SdkConstants.IMAGE_VIEW;
 import static com.android.SdkConstants.MULTI_AUTO_COMPLETE_TEXT_VIEW;
 import static com.android.SdkConstants.RADIO_BUTTON;
 import static com.android.SdkConstants.SEEK_BAR;
@@ -94,7 +95,7 @@
     /** List of platform widgets that have an AppCompat version */
     private static final Set<String> APPCOMPAT_VIEWS = Collections.unmodifiableSet(
             new HashSet<>(
-                    Arrays.asList(TEXT_VIEW, "ImageSwitcher", BUTTON, EDIT_TEXT, SPINNER,
+                    Arrays.asList(TEXT_VIEW, IMAGE_VIEW, BUTTON, EDIT_TEXT, SPINNER,
                             IMAGE_BUTTON, CHECK_BOX, RADIO_BUTTON, CHECKED_TEXT_VIEW,
                             AUTO_COMPLETE_TEXT_VIEW, MULTI_AUTO_COMPLETE_TEXT_VIEW, "RatingBar",
                             SEEK_BAR)));

bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java

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;
     }