Merge \"ChooserActivity: Cannot start app that the icon overflows the layout\" into nyc-mr1-dev

am: 586f23c14b Change-Id: Ie6abdf3303e9f91ae474aca112e39576685d0e5d
2016-07-19 18:33:40 +00:00
parent c5900bce15 586f23c14b
commit 8b059e8aa1
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/widget/ResolverDrawerLayout.java
+++ b/core/java/com/android/internal/widget/ResolverDrawerLayout.java
@@ -245,7 +245,7 @@ public class ResolverDrawerLayout extends ViewGroup {
                final float y = ev.getY();
                mInitialTouchX = x;
                mInitialTouchY = mLastTouchY = y;
-                mOpenOnClick = isListChildUnderClipped(x, y) && mCollapsibleHeight > 0;
+                mOpenOnClick = isListChildUnderClipped(x, y) && mCollapseOffset > 0;
            }
            break;