kingideayou · peacepassion · Feb 19, 2016 · Feb 19, 2016
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,9 @@
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
 /build
 /captures
+
+# Android Studio
+*.iml
+.idea/
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/SlideBottomPanel/src/main/java/me/next/slidebottompanel/SlideBottomPanel.java b/SlideBottomPanel/src/main/java/me/next/slidebottompanel/SlideBottomPanel.java
@@ -130,7 +130,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
 //                if (childView instanceof ViewGroup) {
 //                    ((ViewGroup)childView).setClipChildren(false);
 //                }
-            } else if (childView.getTag() == TAG_BACKGROUND){
+            } else if (childView.getTag() != null && (Integer) childView.getTag() == TAG_BACKGROUND){
                 childView.layout(0, 0, childView.getMeasuredWidth(), childView.getMeasuredHeight());
                 childView.setPadding(0, 0, 0, (int)mTitleHeightNoDisplay);
             }

diff --git a/app/app.iml b/app/app.iml