From 471f9d6ff507cf9dea3d00d9b0cd349727909eeb Mon Sep 17 00:00:00 2001
From: Andy Mast <andy@cyngn.com>
Date: Thu, 24 Jul 2014 11:11:37 -0700
Subject: Overflow Popup

Change-Id: I12ae73059381edab884977969a6dfa6932e55549
---
 src/android/support/v4/view/ThemeViewPager.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/android')

diff --git a/src/android/support/v4/view/ThemeViewPager.java b/src/android/support/v4/view/ThemeViewPager.java
index 9c9b540..cf19404 100644
--- a/src/android/support/v4/view/ThemeViewPager.java
+++ b/src/android/support/v4/view/ThemeViewPager.java
@@ -56,7 +56,7 @@ public class ThemeViewPager extends ViewPager {
         if (!mExpanded && isEnabled()  && !mIsAnimating)  {
             switch (ev.getAction()) {
                 case MotionEvent.ACTION_DOWN:
-                    intercept = !isTouchingApplyButton(ev);
+                    intercept = !isTouching(R.id.apply, ev) && !isTouching(R.id.overflow, ev);
                     break;
             }
         }
@@ -64,20 +64,20 @@ public class ThemeViewPager extends ViewPager {
         return intercept;
     }
 
-    private boolean isTouchingApplyButton(MotionEvent ev) {
+    private boolean isTouching(int viewId, MotionEvent ev) {
         int x = (int) ev.getRawX();
         int y = (int) ev.getRawY();
         View v = getViewForPosition(getCurrentItem());
-        View apply = v.findViewById(R.id.apply);
-        if (apply == null) return false;
+        View touchedView = v.findViewById(viewId);
+        if (touchedView == null) return false;
 
         int location[] = new int[2];
-        apply.getLocationOnScreen(location);
+        touchedView.getLocationOnScreen(location);
         int viewX = location[0];
         int viewY = location[1];
 
-        if((x > viewX && x < (viewX + apply.getWidth())) &&
-                ( y > viewY && y < (viewY + apply.getHeight()))){
+        if((x > viewX && x < (viewX + touchedView.getWidth())) &&
+                ( y > viewY && y < (viewY + touchedView.getHeight()))){
             return true;
         } else {
             return false;
-- 
cgit v1.2.3