From af408e7feef43a15bffe07e16910531919b5c304 Mon Sep 17 00:00:00 2001
From: Dmitry Yunitsky <yunik@mapswithme.com>
Date: Sun, 13 Jul 2014 18:34:37 +0200
Subject: [PATCH] Fixed touch processing on map.

---
 .../nvidia/devtech/NvEventQueueActivity.java  | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/android/src/com/nvidia/devtech/NvEventQueueActivity.java b/android/src/com/nvidia/devtech/NvEventQueueActivity.java
index 5ade74e13e..8fee503b1d 100644
--- a/android/src/com/nvidia/devtech/NvEventQueueActivity.java
+++ b/android/src/com/nvidia/devtech/NvEventQueueActivity.java
@@ -1,5 +1,19 @@
 package com.nvidia.devtech;
 
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.SurfaceHolder;
+import android.view.SurfaceHolder.Callback;
+import android.view.SurfaceView;
+import android.view.View;
+
+import com.mapswithme.maps.R;
+import com.mapswithme.maps.base.MapsWithMeBaseActivity;
+import com.mapswithme.util.log.Logger;
+import com.mapswithme.util.log.StubLogger;
+
 import java.util.Arrays;
 import java.util.Comparator;
 
@@ -10,20 +24,7 @@ import javax.microedition.khronos.egl.EGLContext;
 import javax.microedition.khronos.egl.EGLDisplay;
 import javax.microedition.khronos.egl.EGLSurface;
 
-import android.os.Bundle;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.SurfaceHolder;
-import android.view.SurfaceHolder.Callback;
-import android.view.SurfaceView;
-
-import com.mapswithme.maps.R;
-import com.mapswithme.maps.base.MapsWithMeBaseActivity;
-import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.StubLogger;
-
-public abstract class NvEventQueueActivity extends MapsWithMeBaseActivity
+public abstract class NvEventQueueActivity extends MapsWithMeBaseActivity implements View.OnTouchListener
 {
   private static final String TAG = "NvEventQueueActivity";
 
@@ -104,6 +105,7 @@ public abstract class NvEventQueueActivity extends MapsWithMeBaseActivity
     super.onCreate(savedInstanceState);
 
     final SurfaceView surfaceView = (SurfaceView) findViewById(R.id.map_surfaceview);
+    surfaceView.setOnTouchListener(this);
 
     final SurfaceHolder holder = surfaceView.getHolder();
     holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
@@ -207,7 +209,7 @@ public abstract class NvEventQueueActivity extends MapsWithMeBaseActivity
 
 
   @Override
-  public boolean onTouchEvent(MotionEvent event)
+  public boolean onTouch(View v, MotionEvent event)
   {
     final int count = event.getPointerCount();