fix for adapter backed views

keyboardsurfer · Apr 16, 2014 · 36187a2 · 36187a2
1 parent af375d6
commit 36187a2
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/library/src/main/java/de/keyboardsurfer/android/widget/crouton/Manager.java b/library/src/main/java/de/keyboardsurfer/android/widget/crouton/Manager.java
@@ -23,14 +23,14 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v4.view.accessibility.AccessibilityEventCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
+import android.widget.AdapterView;
 import android.widget.FrameLayout;
 import java.util.Iterator;
 import java.util.Queue;
@@ -196,15 +196,17 @@ private void addCroutonToView(final Crouton crouton) {
     if (null == croutonView.getParent()) {
       ViewGroup.LayoutParams params = croutonView.getLayoutParams();
       if (null == params) {
-        params = new ViewGroup.MarginLayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        params =
+            new ViewGroup.MarginLayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       }
       // display Crouton in ViewGroup is it has been supplied
       if (null != crouton.getViewGroup()) {
         // TODO implement add to last position feature (need to align with how this will be requested for activity)
-        if (crouton.getViewGroup() instanceof FrameLayout) {
-          crouton.getViewGroup().addView(croutonView, params);
+        final ViewGroup croutonViewGroup = crouton.getViewGroup();
+        if (croutonViewGroup instanceof FrameLayout || croutonViewGroup instanceof AdapterView) {
+          croutonViewGroup.addView(croutonView, params);
         } else {
-          crouton.getViewGroup().addView(croutonView, 0, params);
+          croutonViewGroup.addView(croutonView, 0, params);
         }
       } else {
         Activity activity = crouton.getActivity();
@@ -426,7 +428,7 @@ public static void announceForAccessibilityCompat(Context context, CharSequence
       if (Build.VERSION.SDK_INT < 16) {
         eventType = AccessibilityEvent.TYPE_VIEW_FOCUSED;
       } else {
-        eventType = AccessibilityEventCompat.TYPE_ANNOUNCEMENT;
+        eventType = AccessibilityEvent.TYPE_ANNOUNCEMENT;
       }
 
       // Construct an accessibility event with the minimum recommended