summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJin Cao <jinyan@google.com>2014-10-14 11:58:30 -0700
committerJin Cao <jinyan@google.com>2014-10-14 11:58:30 -0700
commitfc33974bf2e77d5fa87ee58156f37cdf8a180a10 (patch)
treec9273d87d6060e13237867842fdfcfd74adcedde /src
parent8d5f3c383c7440c2184163f66b0b4f7ddaf70a03 (diff)
downloadandroid_packages_apps_UnifiedEmail-fc33974bf2e77d5fa87ee58156f37cdf8a180a10.tar.gz
android_packages_apps_UnifiedEmail-fc33974bf2e77d5fa87ee58156f37cdf8a180a10.tar.bz2
android_packages_apps_UnifiedEmail-fc33974bf2e77d5fa87ee58156f37cdf8a180a10.zip
Don't allow for drag during mode change
b/17983791 Change-Id: Ic50b55469f2fa4054daa022c3ee58626fcc7e1c0
Diffstat (limited to 'src')
-rw-r--r--src/com/android/mail/ui/TwoPaneLayout.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/mail/ui/TwoPaneLayout.java b/src/com/android/mail/ui/TwoPaneLayout.java
index 22d5a70fa..2c177866c 100644
--- a/src/com/android/mail/ui/TwoPaneLayout.java
+++ b/src/com/android/mail/ui/TwoPaneLayout.java
@@ -542,6 +542,10 @@ final class TwoPaneLayout extends FrameLayout implements ModeChangeListener,
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
+ if (isModeChangePending()) {
+ return false;
+ }
+
switch (ev.getAction()) {
case MotionEvent.ACTION_DOWN:
final float x = ev.getX();