summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chet Haase <chet@google.com> 2016-08-29 22:13:09 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-08-29 22:13:12 +0000
commit59fb472858a69bf74de9dbee44411b16518a9a21 (patch)
tree8aad1f74a5fa6336222de7b158dee8338c7cdf6b
parent22e006214cf226261576bb21d33c0cf64175292b (diff)
parentcb3e1237b5aacb03523a0f2e597326c2662877cf (diff)
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev
-rw-r--r--core/java/com/android/internal/widget/ResolverDrawerLayout.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/ResolverDrawerLayout.java b/core/java/com/android/internal/widget/ResolverDrawerLayout.java
index 8b9d5034b0c2..e84cc279b403 100644
--- 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;