From 6fcd0207db5d64bf8270aa9f99eea00f8fd9f296 Mon Sep 17 00:00:00 2001
From: Jeff Lu <jll544@yahoo.com>
Date: Thu, 23 Apr 2015 17:03:04 -0700
Subject: [PATCH] Bug 1076692 - OuterLayout should consume touch only when
 dragging is enabled. r=mcomella

--HG--
extra : rebase_source : cf5824e19d663cb8d8fc5887080c74f2011546ff
---
 mobile/android/base/OuterLayout.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/OuterLayout.java b/mobile/android/base/OuterLayout.java
index d8b0e8d302b1..4a40b1a9ab4b 100644
--- a/mobile/android/base/OuterLayout.java
+++ b/mobile/android/base/OuterLayout.java
@@ -161,11 +161,11 @@ public class OuterLayout extends RelativeLayout {
             if (mDragHelper.shouldInterceptTouchEvent(event)) {
                 return true;
             }
-        }
 
-        // Because while open the target layout is translated and draghelper does not catch it.
-        if (mIsOpen && mDragCallback.canInterceptEventWhileOpen(event)) {
-            return true;
+            // Because while open the target layout is translated and draghelper does not catch it.
+            if (mIsOpen && mDragCallback.canInterceptEventWhileOpen(event)) {
+                return true;
+            }
         }
         return false;
     }