From 35d84d5ae3ff11b84ea24673b2774865d4550d6a Mon Sep 17 00:00:00 2001 From: Consti10 Date: Tue, 5 Mar 2024 17:49:02 +0100 Subject: [PATCH] add android and androidqt6 directories for android qt5, qt6 respective --- CMakeLists.txt | 1 - .../src/org/openhd/QOpenHDActivity.java | 67 ------------------- 2 files changed, 68 deletions(-) delete mode 100644 androidqt6/src/org/openhd/QOpenHDActivity.java diff --git a/CMakeLists.txt b/CMakeLists.txt index 3533733fa..09e7bba8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,6 @@ qt_add_executable(QOpenHDApp ## qml/qml.qrc ## - androidqt6/src/org/openhd/QOpenHDActivity.java androidqt6/AndroidManifest.xml ) diff --git a/androidqt6/src/org/openhd/QOpenHDActivity.java b/androidqt6/src/org/openhd/QOpenHDActivity.java deleted file mode 100644 index 75e25a19b..000000000 --- a/androidqt6/src/org/openhd/QOpenHDActivity.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.openhd; - -import android.app.Activity; - -import android.content.Context; - -import org.qtproject.qt.android.bindings.QtActivity; - -// Custom video surface begin -import android.os.Bundle; -import android.view.SurfaceView; -import android.view.View; -import android.view.ViewGroup; -import android.widget.LinearLayout; -import android.widget.FrameLayout; -import android.widget.RelativeLayout; -// Custom video surface end - -public class QOpenHDActivity extends QtActivity { - private static QOpenHDActivity _instance = null; - - private static native void nativeInit(); - - private SurfaceView surfaceView=null; - - public QOpenHDActivity() { - _instance = this; - } - - public void onInit(int status) {} - - public static void jniOnLoad() { - nativeInit(); - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - // Init surface - /*surfaceView = new SurfaceView(this); - surfaceView.setBackgroundColor(0xff0000); - surfaceView.setZOrderOnTop(false); - - FrameLayout frameLayout=new FrameLayout(this); - frameLayout.addView(surfaceView,0);*/ - - // It displaces original QML view. - //setContentView(surfaceView); - - // Add SurfaceView to view container - /*View view = getWindow().getDecorView().getRootView(); - RelativeLayout mainLinearLayout = (RelativeLayout)(((ViewGroup)view).getChildAt(0)); - FrameLayout mainFrameLayout = (FrameLayout)(mainLinearLayout.getChildAt(1)); - mainFrameLayout.addView(surfaceView, 0);*/ - /*ViewGroup viewGroup = (ViewGroup) getWindow().getDecorView().getRootView(); - View view = viewGroup.getChildAt(0); - view.setPadding(0, 150, 0, 0); - - frameLayout.addView((View)view.getParent(),1); - - setContentView(frameLayout);*/ - - - - } -}