1 files changed, 14 insertions, 82 deletions

diff --git a/src/android/jar/src/org/qtproject/qt/android/QtSurface.java b/src/android/jar/src/org/qtproject/qt/android/QtSurface.java
index 1d89aeebef..3165de4811 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtSurface.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtSurface.java
@@ -1,81 +1,33 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 BogDan Vatra <bogdan@kde.org>
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Android port of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2014 BogDan Vatra <bogdan@kde.org>
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 package org.qtproject.qt.android;
 
-import android.app.Activity;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.PixelFormat;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
+import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-
-public class QtSurface extends SurfaceView implements SurfaceHolder.Callback
+@SuppressLint("ViewConstructor")
+class QtSurface extends SurfaceView implements SurfaceHolder.Callback
 {
-    private GestureDetector m_gestureDetector;
-    private Object m_accessibilityDelegate = null;
+    private QtSurfaceInterface m_surfaceCallback;
 
-    public QtSurface(Context context, int id, boolean onTop, int imageDepth)
+    public QtSurface(Context context, QtSurfaceInterface surfaceCallback, boolean onTop, int imageDepth)
     {
         super(context);
         setFocusable(false);
         setFocusableInTouchMode(false);
         setZOrderMediaOverlay(onTop);
+        m_surfaceCallback = surfaceCallback;
         getHolder().addCallback(this);
         if (imageDepth == 16)
             getHolder().setFormat(PixelFormat.RGB_565);
         else
             getHolder().setFormat(PixelFormat.RGBA_8888);
-
-        setId(id);
-        m_gestureDetector =
-            new GestureDetector(context, new GestureDetector.SimpleOnGestureListener() {
-                public void onLongPress(MotionEvent event) {
-                    QtNative.longPress(getId(), (int) event.getX(), (int) event.getY());
-                }
-            });
-        m_gestureDetector.setIsLongpressEnabled(true);
     }
 
     @Override
@@ -88,34 +40,14 @@ public class QtSurface extends SurfaceView implements SurfaceHolder.Callback
     {
         if (width < 1 || height < 1)
             return;
-
-        QtNative.setSurface(getId(), holder.getSurface(), width, height);
+        if (m_surfaceCallback != null)
+            m_surfaceCallback.onSurfaceChanged(holder.getSurface());
     }
 
     @Override
     public void surfaceDestroyed(SurfaceHolder holder)
     {
-        QtNative.setSurface(getId(), null, 0, 0);
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event)
-    {
-        QtNative.sendTouchEvent(event, getId());
-        m_gestureDetector.onTouchEvent(event);
-        return true;
-    }
-
-    @Override
-    public boolean onTrackballEvent(MotionEvent event)
-    {
-        QtNative.sendTrackballEvent(event, getId());
-        return true;
-    }
-
-    @Override
-    public boolean onGenericMotionEvent(MotionEvent event)
-    {
-        return QtNative.sendGenericMotionEvent(event, getId());
+        if (m_surfaceCallback != null)
+            m_surfaceCallback.onSurfaceChanged(null);
     }
 }