Android: rectify the visibility of QtAndroid.jar class

Since we expect soon to support embedding of Qt from native
Android apps, and allowing native apps to access some Qt java
classes as API to enbale the embedding, it's needed now to
set the visibility to public only to classes that are meant
to be public.

Task-number: QTBUG-115017
Change-Id: Iec73f8d39bf9c5f7d303176b2b345d5928fb46c7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>

src/android/jar/CMakeLists.txt

@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 set(java_sources
-    src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java
+    src/org/qtproject/qt/android/QtAccessibilityDelegate.java
-    src/org/qtproject/qt/android/accessibility/QtNativeAccessibility.java
+    src/org/qtproject/qt/android/QtNativeAccessibility.java
     src/org/qtproject/qt/android/CursorHandle.java
     src/org/qtproject/qt/android/EditContextView.java
     src/org/qtproject/qt/android/EditPopupMenu.java

src/android/jar/src/org/qtproject/qt/android/CursorHandle.java

@@ -65,7 +65,7 @@ class CursorView extends ImageView
 }
 
 // Helper class that manages a cursor or selection handle
-public class CursorHandle implements ViewTreeObserver.OnPreDrawListener
+class CursorHandle implements ViewTreeObserver.OnPreDrawListener
 {
     private final View m_layout;
     private CursorView m_cursorView = null;

src/android/jar/src/org/qtproject/qt/android/EditContextView.java

@@ -17,7 +17,7 @@ import android.widget.TextView;
 import java.util.HashMap;
 
 @SuppressLint("ViewConstructor")
-public class EditContextView extends LinearLayout implements View.OnClickListener
+class EditContextView extends LinearLayout implements View.OnClickListener
 {
     public static final int CUT_BUTTON   = 1;
     public static final int COPY_BUTTON  = 1 << 1;

src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java

@@ -14,7 +14,7 @@ import android.view.ViewTreeObserver;
 import android.widget.PopupWindow;
 
 // Helper class that manages a cursor or selection handle
-public class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.OnLayoutChangeListener,
+class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.OnLayoutChangeListener,
         EditContextView.OnClickListener
 {
     private final View m_layout;

src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java

@@ -61,7 +61,7 @@ import java.util.Map;
 import java.util.Objects;
 
 
-public class ExtractStyle {
+class ExtractStyle {
 
     // This used to be retrieved from android.R.styleable.ViewDrawableStates field via reflection,
     // but since the access to that is restricted, we need to have hard-coded here.

src/android/jar/src/org/qtproject/qt/android/QtAccessibilityDelegate.java

@@ -2,7 +2,7 @@
 // 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.accessibility;
+package org.qtproject.qt.android;
 
 import android.app.Activity;
 import android.content.Context;
@@ -22,10 +22,7 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeInfo.CollectionInfo;
 import android.view.accessibility.AccessibilityNodeProvider;
 
-import org.qtproject.qt.android.QtActivityDelegate;
+class QtAccessibilityDelegate extends View.AccessibilityDelegate
-import org.qtproject.qt.android.QtNative;
-
-public class QtAccessibilityDelegate extends View.AccessibilityDelegate
 {
     private static final String TAG = "Qt A11Y";
 

src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java

@@ -32,9 +32,7 @@ import android.widget.PopupMenu;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.qtproject.qt.android.accessibility.QtAccessibilityDelegate;
+class QtActivityDelegate
-
-public class QtActivityDelegate
 {
     private Activity m_activity;
 

src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java

@@ -21,7 +21,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 
-public class QtActivityLoader extends QtLoader {
+class QtActivityLoader extends QtLoader {
     private final Activity m_activity;
 
     public QtActivityLoader(Activity activity)

src/android/jar/src/org/qtproject/qt/android/QtClipboardManager.java

@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import java.util.Objects;
 import java.util.concurrent.Semaphore;
 
-public class QtClipboardManager
+class QtClipboardManager
 {
     public static native void onClipboardDataChanged(long nativePointer);
 

src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java

@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-public class QtDisplayManager {
+class QtDisplayManager {
 
     // screen methods
     public static native void setDisplayMetrics(int screenWidthPixels, int screenHeightPixels,

src/android/jar/src/org/qtproject/qt/android/QtEditText.java

@@ -13,7 +13,7 @@ import android.view.inputmethod.InputConnection;
 
 import org.qtproject.qt.android.QtInputConnection.QtInputConnectionListener;
 
-public class QtEditText extends View
+class QtEditText extends View
 {
     int m_initialCapsMode = 0;
     int m_imeOptions = 0;

src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java

@@ -52,7 +52,7 @@ class QtNativeInputConnection
     static native boolean updateCursorPosition();
 }
 
-public class QtInputConnection extends BaseInputConnection
+class QtInputConnection extends BaseInputConnection
 {
     private static final int ID_SELECT_ALL = android.R.id.selectAll;
     private static final int ID_CUT = android.R.id.cut;

src/android/jar/src/org/qtproject/qt/android/QtInputDelegate.java

@@ -21,7 +21,7 @@ import android.view.inputmethod.InputMethodManager;
 import org.qtproject.qt.android.QtInputConnection.QtInputConnectionListener;
 
 /** @noinspection FieldCanBeLocal*/
-public class QtInputDelegate {
+class QtInputDelegate {
 
     // keyboard methods
     public static native void keyDown(int key, int unicode, int modifier, boolean autoRepeat);

src/android/jar/src/org/qtproject/qt/android/QtLayout.java

@@ -10,7 +10,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 
-public class QtLayout extends ViewGroup
+class QtLayout extends ViewGroup
 {
     private int m_activityDisplayRotation = -1;
     private int m_ownDisplayRotation = -1;

src/android/jar/src/org/qtproject/qt/android/QtLoader.java

@@ -24,7 +24,7 @@ import java.util.Objects;
 
 import dalvik.system.DexClassLoader;
 
-public abstract class QtLoader {
+abstract class QtLoader {
 
     protected static final String QtTAG = "QtLoader";
 

src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java

@@ -46,7 +46,7 @@ class ButtonStruct implements View.OnClickListener
     }
 }
 
-public class QtMessageDialogHelper
+class QtMessageDialogHelper
 {
 
     public QtMessageDialogHelper(Activity activity)

src/android/jar/src/org/qtproject/qt/android/QtNative.java

@@ -30,7 +30,7 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
-public class QtNative
+class QtNative
 {
     private static WeakReference<Activity> m_activity = null;
     private static WeakReference<Service> m_service = null;

src/android/jar/src/org/qtproject/qt/android/QtNativeAccessibility.java

@@ -1,7 +1,7 @@
 // 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.accessibility;
+package org.qtproject.qt.android;
 
 import android.graphics.Rect;
 import android.view.accessibility.AccessibilityNodeInfo;

src/android/jar/src/org/qtproject/qt/android/QtServiceLoader.java

@@ -12,7 +12,7 @@ import android.util.Log;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-public class QtServiceLoader extends QtLoader {
+class QtServiceLoader extends QtLoader {
     private final Service m_service;
 
     public QtServiceLoader(Service service) {

src/android/jar/src/org/qtproject/qt/android/QtSurface.java

@@ -13,7 +13,7 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
 @SuppressLint("ViewConstructor")
-public class QtSurface extends SurfaceView implements SurfaceHolder.Callback
+class QtSurface extends SurfaceView implements SurfaceHolder.Callback
 {
     private final GestureDetector m_gestureDetector;
 

src/android/jar/src/org/qtproject/qt/android/QtThread.java

@@ -6,7 +6,7 @@ package org.qtproject.qt.android;
 import java.util.ArrayList;
 import java.util.concurrent.Semaphore;
 
-public class QtThread {
+class QtThread {
     private final ArrayList<Runnable> m_pendingRunnables = new ArrayList<>();
     private boolean m_exit = false;
     private final Thread m_qtThread = new Thread(new Runnable() {

src/android/jar/src/org/qtproject/qt/android/extras/QtAndroidBinder.java

@@ -8,7 +8,7 @@ import android.os.Parcel;
 
 import org.qtproject.qt.android.UsedFromNativeCode;
 
-public class QtAndroidBinder extends Binder
+class QtAndroidBinder extends Binder
 {
     @UsedFromNativeCode
     public QtAndroidBinder(long id)

src/android/jar/src/org/qtproject/qt/android/extras/QtAndroidServiceConnection.java

@@ -9,7 +9,7 @@ import android.os.IBinder;
 
 import org.qtproject.qt.android.UsedFromNativeCode;
 
-public class QtAndroidServiceConnection implements ServiceConnection
+class QtAndroidServiceConnection implements ServiceConnection
 {
     @UsedFromNativeCode
     public QtAndroidServiceConnection(long id)

src/android/jar/src/org/qtproject/qt/android/extras/QtNative.java

@@ -6,7 +6,7 @@ package org.qtproject.qt.android.extras;
 import android.os.IBinder;
 import android.os.Parcel;
 
-public class QtNative {
+class QtNative {
     // Binder
     public static native boolean onTransact(long id, int code, Parcel data, Parcel reply, int flags);
 

src/plugins/platforms/android/androidjniaccessibility.cpp

@@ -569,7 +569,7 @@ namespace QtAndroidAccessibility
 
     bool registerNatives(QJniEnvironment &env)
     {
-        if (!env.registerNativeMethods("org/qtproject/qt/android/accessibility/QtNativeAccessibility",
+        if (!env.registerNativeMethods("org/qtproject/qt/android/QtNativeAccessibility",
                                       methods, sizeof(methods) / sizeof(methods[0]))) {
             __android_log_print(ANDROID_LOG_FATAL,"Qt A11y", "RegisterNatives failed");
             return false;