From 93aa5ceeff84ffcee8ea9f815787cb13422e5112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tinja=20Paavosepp=C3=A4?= <tinja.paavoseppa@qt.io>
Date: Wed, 7 Feb 2024 11:17:22 +0200
Subject: [PATCH] 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.

Change-Id: Ic58b5ab7644ffb3a60833b6507115b20db3f29de
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 0ae95cb1f72782d5890f34c00b91eed15936ad29)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../org/qtproject/qt/android/QtLayout.java    | 38 -------------------
 .../org/qtproject/qt/android/QtWindow.java    |  1 +
 2 files changed, 1 insertion(+), 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 511f7334798..cf7e68926e0 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);
@@ -45,30 +31,6 @@ class QtLayout extends ViewGroup {
         super(context, attrs, defStyle);
     }
 
-    @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)
     {
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 43dd094a7d5..08e093dd377 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 @@ public 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;