commit 1962900a77f843187cf99163ccbba5e6b89e8b47
author Diego Perez <diegoperez@google.com> Wed Aug 03 15:41:03 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 03 15:41:04 2016 +0000
tree 2b546cd031d6bbfd74ccf62687b72a801b2b3bcc
parent 15edd86645ccf439a28a845b9e9ea55fa25a0310
parent 13236ec595a2adee7c2ff73902d9b38fd0e4c0bd

Merge "ImageSwitcher -> ImageView in appcompat inflate"

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