Android: Remove unused QtLayout.TouchListener

Now that QtWindow extends QtLayout again, the touch listener interface
is unused as QtWindow can directly handle the touch events.

Pick-to: 6.7
Change-Id: Ic58b5ab7644ffb3a60833b6507115b20db3f29de
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

2 files changed, 1 insertions, 38 deletions

diff --git a/src/android/jar/src/org/qtproject/qt/android/QtLayout.java b/src/android/jar/src/org/qtproject/qt/android/QtLayout.java
index 511f733479..cf7e68926e 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtLayout.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtLayout.java
@@ -16,25 +16,11 @@ import android.view.ViewGroup;
 
 class QtLayout extends ViewGroup {
 
-    interface QtTouchListener  {
-        public boolean onTouchEvent(MotionEvent event);
-        public boolean onTrackballEvent(MotionEvent event);
-        public boolean onGenericMotionEvent(MotionEvent event);
-    }
-
-    private QtTouchListener m_touchListener;
-
     public QtLayout(Context context)
     {
         super(context);
     }
 
-    public QtLayout(Context context, QtTouchListener listener)
-    {
-        super(context);
-        m_touchListener = listener;
-    }
-
     public QtLayout(Context context, AttributeSet attrs)
     {
         super(context, attrs);
@@ -46,30 +32,6 @@ class QtLayout extends ViewGroup {
     }
 
     @Override
-    public boolean onTouchEvent(MotionEvent event)
-    {
-        if (m_touchListener != null) {
-            event.setLocation(event.getX() + getX(), event.getY() + getY());
-            return m_touchListener.onTouchEvent(event);
-        }
-        return false;
-    }
-    @Override
-    public boolean onTrackballEvent(MotionEvent event)
-    {;
-        if (m_touchListener != null)
-            return m_touchListener.onTrackballEvent(event);
-        return false;
-    }
-    @Override
-    public boolean onGenericMotionEvent(MotionEvent event)
-    {
-        if (m_touchListener != null)
-            return m_touchListener.onGenericMotionEvent(event);
-        return false;
-    }
-
-    @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
     {
         int count = getChildCount();
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtWindow.java b/src/android/jar/src/org/qtproject/qt/android/QtWindow.java
index 61feade98f..08762ce237 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtWindow.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtWindow.java
@@ -59,6 +59,7 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
     @Override
     public boolean onTouchEvent(MotionEvent event)
     {
+        event.setLocation(event.getX() + getX(), event.getY() + getY());
         QtInputDelegate.sendTouchEvent(event, getId());
         m_gestureDetector.onTouchEvent(event);
         return true;