Merge pull request #5241 from ayeung/timob-16204-3_2_X

TIMOB-16204-3_2_X: Null check on gestureDetector when touch is not enabled.
tidev · Jan 21, 2014 · 6f7e098 · 6f7e098
2 parents 4d85b63 + 68ab81a
commit 6f7e098
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollView.java
@@ -7,7 +7,6 @@
 package ti.modules.titanium.ui.widget;
 
 import java.util.HashMap;
-import java.util.List;
 
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/webview/TiUIWebView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/webview/TiUIWebView.java
@@ -108,9 +108,14 @@ public boolean onTouchEvent(MotionEvent ev)
 					handled = proxy.fireEvent(TiC.EVENT_CLICK, dictFromEvent(ev));
 				}
 			}
-
-			boolean swipeHandled = detector.onTouchEvent(ev);
-
+
+			boolean swipeHandled = false;
+
+			// detect will be null when touch is disabled
+			if (detector != null) {
+				swipeHandled = detector.onTouchEvent(ev);
+			}
+
 			// Don't return here -- must call super.onTouchEvent()
 
 			boolean superHandled = super.onTouchEvent(ev);

diff --git a/android/titanium/src/java/org/appcelerator/titanium/proxy/TiViewProxy.java b/android/titanium/src/java/org/appcelerator/titanium/proxy/TiViewProxy.java
@@ -33,8 +33,6 @@
 import org.appcelerator.titanium.view.TiUIView;
 
 import android.app.Activity;
-import android.graphics.Matrix;
-import android.graphics.RectF;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Message;