diff --git a/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java b/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java
index 7e601c05517..015ff9349c9 100644
--- a/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java
+++ b/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java
@@ -33,7 +33,7 @@ class CursorView extends ImageView
     }
 
     // Called when the handle was moved programmatically , with the delta amount in pixels
-    public void adjusted(int dx, int dy) {
+    void adjusted(int dx, int dy) {
         m_offsetX += dx;
         m_offsetY += dy;
     }
@@ -83,7 +83,7 @@ class CursorHandle implements ViewTreeObserver.OnPreDrawListener
     private final boolean m_rtl;
     int m_yShift;
 
-    public CursorHandle(Activity activity, View layout, int id, int attr, boolean rtl) {
+    CursorHandle(Activity activity, View layout, int id, int attr, boolean rtl) {
         m_activity = activity;
         m_id = id;
         m_attr = attr;
@@ -123,7 +123,7 @@ class CursorHandle implements ViewTreeObserver.OnPreDrawListener
     }
 
     // Show the handle at a given position (or move it if it is already shown)
-    public void setPosition(final int x, final int y){
+    void setPosition(final int x, final int y){
         initOverlay();
 
         final int[] layoutLocation = new int[2];
@@ -157,7 +157,7 @@ class CursorHandle implements ViewTreeObserver.OnPreDrawListener
         m_posY = y;
     }
 
-    public int bottom()
+    int bottom()
     {
         initOverlay();
         final int[] location = new int[2];
@@ -165,19 +165,19 @@ class CursorHandle implements ViewTreeObserver.OnPreDrawListener
         return location[1] + m_cursorView.getHeight();
     }
 
-    public void hide() {
+    void hide() {
         if (m_popup != null) {
             m_popup.dismiss();
         }
     }
 
-    public int width()
+    int width()
     {
         return m_cursorView.getDrawable().getIntrinsicWidth();
     }
 
     // The handle was dragged by a given relative position
-    public void updatePosition(int x, int y) {
+    void updatePosition(int x, int y) {
         y -= m_yShift;
         if (Math.abs(m_lastX - x) > tolerance || Math.abs(m_lastY - y) > tolerance) {
             QtInputDelegate.handleLocationChanged(m_id, x + m_posX, y + m_posY);
diff --git a/src/android/jar/src/org/qtproject/qt/android/EditContextView.java b/src/android/jar/src/org/qtproject/qt/android/EditContextView.java
index fbd32ed98b7..fc34b41e940 100644
--- a/src/android/jar/src/org/qtproject/qt/android/EditContextView.java
+++ b/src/android/jar/src/org/qtproject/qt/android/EditContextView.java
@@ -19,23 +19,23 @@ import java.util.HashMap;
 @SuppressLint("ViewConstructor")
 class EditContextView extends LinearLayout implements View.OnClickListener
 {
-    public static final int CUT_BUTTON   = 1;
-    public static final int COPY_BUTTON  = 1 << 1;
-    public static final int PASTE_BUTTON = 1 << 2;
-    public static final int SELECT_ALL_BUTTON = 1 << 3;
+    static final int CUT_BUTTON   = 1;
+    static final int COPY_BUTTON  = 1 << 1;
+    static final int PASTE_BUTTON = 1 << 2;
+    static final int SELECT_ALL_BUTTON = 1 << 3;
 
     HashMap<Integer, ContextButton> m_buttons = new HashMap<>(4);
     OnClickListener m_onClickListener;
 
-    public interface OnClickListener
+    interface OnClickListener
     {
         void contextButtonClicked(int buttonId);
     }
 
     private class ContextButton extends TextView
     {
-        public int m_buttonId;
-        public ContextButton(Context context, int stringId) {
+        int m_buttonId;
+        ContextButton(Context context, int stringId) {
             super(context);
             m_buttonId = stringId;
             setText(stringId);
@@ -70,7 +70,7 @@ class EditContextView extends LinearLayout implements View.OnClickListener
         addView(button);
     }
 
-    public void updateButtons(int buttonsLayout)
+    void updateButtons(int buttonsLayout)
     {
         ContextButton button = m_buttons.get(android.R.string.cut);
         if (button != null)
@@ -89,7 +89,7 @@ class EditContextView extends LinearLayout implements View.OnClickListener
             button.setVisibility((buttonsLayout & SELECT_ALL_BUTTON) != 0 ? View.VISIBLE : View.GONE);
     }
 
-    public Point getCalculatedSize()
+    Point getCalculatedSize()
     {
         Point size = new Point(0, 0);
         for (ContextButton b : m_buttons.values()) {
@@ -106,7 +106,7 @@ class EditContextView extends LinearLayout implements View.OnClickListener
         return size;
     }
 
-    public EditContextView(Context context, OnClickListener onClickListener) {
+    EditContextView(Context context, OnClickListener onClickListener) {
         super(context);
         m_onClickListener = onClickListener;
         setLayoutParams(new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
diff --git a/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java b/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java
index 25be522c485..00097f4003e 100644
--- a/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java
+++ b/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java
@@ -27,7 +27,7 @@ class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.OnLayout
     private CursorHandle m_leftSelectionHandle;
     private CursorHandle m_rightSelectionHandle;
 
-    public EditPopupMenu(Activity activity, View layout)
+    EditPopupMenu(Activity activity, View layout)
     {
         m_activity = activity;
         m_view = new EditContextView(activity, this);
@@ -53,7 +53,7 @@ class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.OnLayout
     }
 
     // Show the handle at a given position (or move it if it is already shown)
-    public void setPosition(final int x, final int y, final int buttons,
+    void setPosition(final int x, final int y, final int buttons,
                             CursorHandle cursorHandle, CursorHandle leftSelectionHandle, CursorHandle rightSelectionHandle)
     {
         initOverlay();
@@ -105,7 +105,7 @@ class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.OnLayout
         m_rightSelectionHandle = rightSelectionHandle;
     }
 
-    public void hide() {
+    void hide() {
         if (m_popup != null) {
             m_popup.dismiss();
             m_popup = null;
diff --git a/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
index 6780634317a..50722e54de3 100644
--- a/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
+++ b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
@@ -149,7 +149,7 @@ class ExtractStyle {
         return (config.uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
     }
 
-    public static String setup(Context context, String extractOption, int dpi) {
+    static String setup(Context context, String extractOption, int dpi) {
 
         String dataDir = context.getApplicationInfo().dataDir;
         m_stylePath = dataDir + "/qt-reserved-files/android-style/" + dpi + "/";
@@ -189,7 +189,7 @@ class ExtractStyle {
         return m_stylePath;
     }
 
-    public static void runIfNeeded(Context context, boolean extractDarkMode) {
+    static void runIfNeeded(Context context, boolean extractDarkMode) {
         if (m_stylePath == null)
             return;
         if (extractDarkMode) {
@@ -203,7 +203,7 @@ class ExtractStyle {
         }
     }
 
-    public ExtractStyle(Context context, String extractPath, boolean minimal) {
+    ExtractStyle(Context context, String extractPath, boolean minimal) {
         m_minimal = minimal;
         m_extractPath = extractPath + "/";
         boolean dirCreated = new File(m_extractPath).mkdirs();
@@ -770,7 +770,7 @@ class ExtractStyle {
         return json;
     }
 
-    public JSONObject getDrawable(Object drawable, String filename, Rect padding) {
+    JSONObject getDrawable(Object drawable, String filename, Rect padding) {
         if (drawable == null || m_minimal)
             return null;
 
@@ -951,11 +951,11 @@ class ExtractStyle {
         return sortedAttrs;
     }
 
-    public void extractViewInformation(int styleName, JSONObject json, String qtClassName) {
+    void extractViewInformation(int styleName, JSONObject json, String qtClassName) {
         extractViewInformation(styleName, json, qtClassName, null);
     }
 
-    public void extractViewInformation(int styleName, JSONObject json, String qtClassName, AttributeSet attributeSet) {
+    void extractViewInformation(int styleName, JSONObject json, String qtClassName, AttributeSet attributeSet) {
         try {
             TypedValue typedValue = new TypedValue();
             Context ctx = new ContextThemeWrapper(m_context, m_theme);
@@ -1077,13 +1077,13 @@ class ExtractStyle {
         }
     }
 
-    public JSONObject extractTextAppearance(int styleName)
+    JSONObject extractTextAppearance(int styleName)
     {
         return extractTextAppearance(styleName, false);
     }
 
     @SuppressLint("ResourceType")
-    public JSONObject extractTextAppearance(int styleName, boolean subStyle)
+    JSONObject extractTextAppearance(int styleName, boolean subStyle)
     {
         final int[] attributes = new int[]{
                 android.R.attr.textSize,
@@ -1135,11 +1135,11 @@ class ExtractStyle {
         return json;
     }
 
-    public JSONObject extractTextAppearanceInformation(int styleName, String qtClass) {
+    JSONObject extractTextAppearanceInformation(int styleName, String qtClass) {
         return extractTextAppearanceInformation(styleName, qtClass, android.R.attr.textAppearance, null);
     }
 
-    public JSONObject extractTextAppearanceInformation(int styleName, String qtClass, int textAppearance, AttributeSet attributeSet) {
+    JSONObject extractTextAppearanceInformation(int styleName, String qtClass, int textAppearance, AttributeSet attributeSet) {
         JSONObject json = new JSONObject();
         extractViewInformation(styleName, json, qtClass, attributeSet);
 
@@ -1371,7 +1371,7 @@ class ExtractStyle {
         return json;
     }
 
-    public JSONObject extractImageViewInformation(int styleName, String qtClassName) {
+    JSONObject extractImageViewInformation(int styleName, String qtClassName) {
         JSONObject json = new JSONObject();
         try {
             extractViewInformation(styleName, json, qtClassName);
@@ -1805,11 +1805,11 @@ class ExtractStyle {
         private boolean m_addComma = false;
         private int m_indentLevel = 0;
 
-        public SimpleJsonWriter(String filePath) throws FileNotFoundException {
+        SimpleJsonWriter(String filePath) throws FileNotFoundException {
             m_writer = new OutputStreamWriter(new FileOutputStream(filePath));
         }
 
-        public void close() throws IOException {
+        void close() throws IOException {
             m_writer.close();
         }
 
@@ -1850,7 +1850,7 @@ class ExtractStyle {
     static class DrawableCache {
         JSONObject object;
         Object drawable;
-        public DrawableCache(JSONObject json, Object drawable) {
+        DrawableCache(JSONObject json, Object drawable) {
             object = json;
             this.drawable = drawable;
         }
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtAccessibilityDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtAccessibilityDelegate.java
index 8558e42c3b8..2c25febb4d1 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtAccessibilityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtAccessibilityDelegate.java
@@ -28,7 +28,7 @@ class QtAccessibilityDelegate extends View.AccessibilityDelegate
 
     // Qt uses the upper half of the unsigned integers
     // all low positive ints should be fine.
-    public static final int INVALID_ID = 333; // half evil
+    static final int INVALID_ID = 333; // half evil
 
     // The platform might ask for the class implementing the "view".
     // Pretend to be an inner class of the QtSurface.
@@ -63,7 +63,7 @@ class QtAccessibilityDelegate extends View.AccessibilityDelegate
     // e.g. one per window?
     // FIXME make QtAccessibilityDelegate window based or verify current way works
     // also for child windows: QTBUG-120685
-    public QtAccessibilityDelegate(QtLayout layout)
+    QtAccessibilityDelegate(QtLayout layout)
     {
         m_layout = layout;
 
@@ -156,13 +156,13 @@ class QtAccessibilityDelegate extends View.AccessibilityDelegate
         return true;
     }
 
-    public void notifyScrolledEvent(int viewId)
+    void notifyScrolledEvent(int viewId)
     {
         QtNative.runAction(() -> sendEventForVirtualViewId(viewId,
                 AccessibilityEvent.TYPE_VIEW_SCROLLED));
     }
 
-    public void notifyLocationChange(int viewId)
+    void notifyLocationChange(int viewId)
     {
         QtNative.runAction(() -> {
             if (m_focusedVirtualViewId == viewId)
@@ -170,7 +170,7 @@ class QtAccessibilityDelegate extends View.AccessibilityDelegate
         });
     }
 
-    public void notifyObjectHide(int viewId, int parentId)
+    void notifyObjectHide(int viewId, int parentId)
     {
         QtNative.runAction(() -> {
             // If the object had accessibility focus, we need to clear it.
@@ -189,7 +189,7 @@ class QtAccessibilityDelegate extends View.AccessibilityDelegate
         });
     }
 
-    public void notifyObjectShow(int parentId)
+    void notifyObjectShow(int parentId)
     {
         QtNative.runAction(() -> {
             // When the object is shown, we need to notify its parent about
@@ -198,7 +198,7 @@ class QtAccessibilityDelegate extends View.AccessibilityDelegate
         });
     }
 
-    public void notifyObjectFocus(int viewId)
+    void notifyObjectFocus(int viewId)
     {
         QtNative.runAction(() -> {
             if (m_view == null)
@@ -210,7 +210,7 @@ class QtAccessibilityDelegate extends View.AccessibilityDelegate
         });
     }
 
-    public void notifyValueChanged(int viewId, String value)
+    void notifyValueChanged(int viewId, String value)
     {
         QtNative.runAction(() -> {
             // Send a TYPE_ANNOUNCEMENT event with the new value
@@ -247,13 +247,13 @@ class QtAccessibilityDelegate extends View.AccessibilityDelegate
         });
     }
 
-    public void sendEventForVirtualViewId(int virtualViewId, int eventType)
+    void sendEventForVirtualViewId(int virtualViewId, int eventType)
     {
         final AccessibilityEvent event = getEventForVirtualViewId(virtualViewId, eventType);
         sendAccessibilityEvent(event);
     }
 
-    public void sendAccessibilityEvent(AccessibilityEvent event)
+    void sendAccessibilityEvent(AccessibilityEvent event)
     {
         if (event == null)
             return;
@@ -267,7 +267,7 @@ class QtAccessibilityDelegate extends View.AccessibilityDelegate
         group.requestSendAccessibilityEvent(m_view, event);
     }
 
-    public void invalidateVirtualViewId(int virtualViewId)
+    void invalidateVirtualViewId(int virtualViewId)
     {
         final AccessibilityEvent event = getEventForVirtualViewId(virtualViewId, AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED);
 
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
index d78c059094b..1096ccf1b7d 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
@@ -324,7 +324,7 @@ class QtActivityDelegate extends QtActivityDelegateBase
 
     private boolean m_contextMenuVisible = false;
 
-    public void onCreatePopupMenu(Menu menu)
+    void onCreatePopupMenu(Menu menu)
     {
         QtNative.fillContextMenu(menu);
         m_contextMenuVisible = true;
@@ -426,7 +426,7 @@ class QtActivityDelegate extends QtActivityDelegateBase
 
     // TODO: QTBUG-122761 To be removed after QtAndroidAutomotive does not depend on it.
     @UsedFromNativeCode
-    public void insertNativeView(int id, View view, int x, int y, int w, int h)
+    void insertNativeView(int id, View view, int x, int y, int w, int h)
     {
         QtNative.runAction(()-> {
             if (m_dummyView != null) {
@@ -452,7 +452,7 @@ class QtActivityDelegate extends QtActivityDelegateBase
 
     // TODO: QTBUG-122761 To be removed after QtAndroidAutomotive does not depend on it.
     @UsedFromNativeCode
-    public void setNativeViewGeometry(int id, int x, int y, int w, int h)
+    void setNativeViewGeometry(int id, int x, int y, int w, int h)
     {
         QtNative.runAction(() -> {
             if (m_nativeViews.containsKey(id)) {
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java
index 84a5961b8a6..0e74884a773 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java
@@ -77,7 +77,7 @@ abstract class QtActivityDelegateBase
         return m_contextMenuVisible;
     }
 
-    public void startNativeApplication(String appParams, String mainLib)
+    void startNativeApplication(String appParams, String mainLib)
     {
         if (m_membersInitialized)
             return;
@@ -128,7 +128,7 @@ abstract class QtActivityDelegateBase
         }
     }
 
-    public void hideSplashScreen()
+    void hideSplashScreen()
     {
         hideSplashScreen(0);
     }
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java
index 1b2e8e49a0e..93f28756b7d 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java
@@ -26,7 +26,7 @@ import java.nio.charset.StandardCharsets;
 class QtActivityLoader extends QtLoader {
     private final Activity m_activity;
 
-    public QtActivityLoader(Activity activity)
+    QtActivityLoader(Activity activity)
     {
         super(new ContextWrapper(activity));
         m_activity = activity;
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtClipboardManager.java b/src/android/jar/src/org/qtproject/qt/android/QtClipboardManager.java
index ac0d4e18903..9c3e9aff768 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtClipboardManager.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtClipboardManager.java
@@ -18,14 +18,14 @@ import java.util.concurrent.Semaphore;
 
 class QtClipboardManager
 {
-    public static native void onClipboardDataChanged(long nativePointer);
+    static native void onClipboardDataChanged(long nativePointer);
 
     private final static String TAG = "QtClipboardManager";
     private ClipboardManager m_clipboardManager = null;
     private boolean m_usePrimaryClip = false;
     private final long m_nativePointer;
 
-    public QtClipboardManager(Context context, long nativePointer)
+    QtClipboardManager(Context context, long nativePointer)
     {
         m_nativePointer = nativePointer;
         registerClipboardManager(context);
@@ -53,7 +53,7 @@ class QtClipboardManager
     }
 
     @UsedFromNativeCode
-    public void clearClipData()
+    void clearClipData()
     {
         if (m_clipboardManager != null) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
@@ -68,7 +68,7 @@ class QtClipboardManager
     }
 
     @UsedFromNativeCode
-    public void setClipboardText(Context context, String text)
+    void setClipboardText(Context context, String text)
     {
         if (m_clipboardManager != null) {
             ClipData clipData = ClipData.newPlainText("text/plain", text);
@@ -76,7 +76,7 @@ class QtClipboardManager
         }
     }
 
-    public static boolean hasClipboardText(Context context)
+    static boolean hasClipboardText(Context context)
     {
         ClipboardManager clipboardManager =
                 (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
@@ -98,13 +98,13 @@ class QtClipboardManager
     }
 
     @UsedFromNativeCode
-    public boolean hasClipboardText()
+    boolean hasClipboardText()
     {
         return hasClipboardMimeType("text/(.*)");
     }
 
     @UsedFromNativeCode
-    public String getClipboardText()
+    String getClipboardText()
     {
         try {
             if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
@@ -143,7 +143,7 @@ class QtClipboardManager
     }
 
     @UsedFromNativeCode
-    public void setClipboardHtml(Context context, String text, String html)
+    void setClipboardHtml(Context context, String text, String html)
     {
         if (m_clipboardManager != null) {
             ClipData clipData = ClipData.newHtmlText("text/html", text, html);
@@ -170,13 +170,13 @@ class QtClipboardManager
     }
 
     @UsedFromNativeCode
-    public boolean hasClipboardHtml()
+    boolean hasClipboardHtml()
     {
         return hasClipboardMimeType("text/html");
     }
 
     @UsedFromNativeCode
-    public String getClipboardHtml()
+    String getClipboardHtml()
     {
         try {
             if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
@@ -194,7 +194,7 @@ class QtClipboardManager
     }
 
     @UsedFromNativeCode
-    public void setClipboardUri(Context context, String uriString)
+    void setClipboardUri(Context context, String uriString)
     {
         if (m_clipboardManager != null) {
             ClipData clipData = ClipData.newUri(context.getContentResolver(), "text/uri-list",
@@ -204,7 +204,7 @@ class QtClipboardManager
     }
 
     @UsedFromNativeCode
-    public boolean hasClipboardUri()
+    boolean hasClipboardUri()
     {
         return hasClipboardMimeType("text/uri-list");
     }
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java b/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java
index b6a52fb22f4..e4de2434e22 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java
@@ -25,23 +25,23 @@ import java.util.List;
 class QtDisplayManager {
 
     // screen methods
-    public static native void setDisplayMetrics(int screenWidthPixels, int screenHeightPixels,
+    static native void setDisplayMetrics(int screenWidthPixels, int screenHeightPixels,
                                                 int availableLeftPixels, int availableTopPixels,
                                                 int availableWidthPixels, int availableHeightPixels,
                                                 double XDpi, double YDpi, double scaledDensity,
                                                 double density, float refreshRate);
-    public static native void handleOrientationChanged(int newRotation, int nativeOrientation);
-    public static native void handleRefreshRateChanged(float refreshRate);
-    public static native void handleUiDarkModeChanged(int newUiMode);
-    public static native void handleScreenAdded(int displayId);
-    public static native void handleScreenChanged(int displayId);
-    public static native void handleScreenRemoved(int displayId);
+    static native void handleOrientationChanged(int newRotation, int nativeOrientation);
+    static native void handleRefreshRateChanged(float refreshRate);
+    static native void handleUiDarkModeChanged(int newUiMode);
+    static native void handleScreenAdded(int displayId);
+    static native void handleScreenChanged(int displayId);
+    static native void handleScreenRemoved(int displayId);
     // screen methods
 
     // Keep in sync with QtAndroid::SystemUiVisibility in androidjnimain.h
-    public static final int SYSTEM_UI_VISIBILITY_NORMAL = 0;
-    public static final int SYSTEM_UI_VISIBILITY_FULLSCREEN = 1;
-    public static final int SYSTEM_UI_VISIBILITY_TRANSLUCENT = 2;
+    static final int SYSTEM_UI_VISIBILITY_NORMAL = 0;
+    static final int SYSTEM_UI_VISIBILITY_FULLSCREEN = 1;
+    static final int SYSTEM_UI_VISIBILITY_TRANSLUCENT = 2;
     private int m_systemUiVisibility = SYSTEM_UI_VISIBILITY_NORMAL;
 
     private static int m_previousRotation = -1;
@@ -89,7 +89,7 @@ class QtDisplayManager {
         m_previousRotation = currentRotation;
     }
 
-    public static int getDisplayRotation(Activity activity) {
+    static int getDisplayRotation(Activity activity) {
         Display display = Build.VERSION.SDK_INT < Build.VERSION_CODES.R ?
                 activity.getWindowManager().getDefaultDisplay() :
                 activity.getDisplay();
@@ -113,21 +113,21 @@ class QtDisplayManager {
         return display != null ? display.getRefreshRate() : 60.0f;
     }
 
-    public void registerDisplayListener()
+    void registerDisplayListener()
     {
         DisplayManager displayManager =
                 (DisplayManager) m_activity.getSystemService(Context.DISPLAY_SERVICE);
         displayManager.registerDisplayListener(m_displayListener, null);
     }
 
-    public void unregisterDisplayListener()
+    void unregisterDisplayListener()
     {
         DisplayManager displayManager =
                 (DisplayManager) m_activity.getSystemService(Context.DISPLAY_SERVICE);
         displayManager.unregisterDisplayListener(m_displayListener);
     }
 
-    public void setSystemUiVisibility(int systemUiVisibility)
+    void setSystemUiVisibility(int systemUiVisibility)
     {
         if (m_systemUiVisibility == systemUiVisibility)
             return;
@@ -173,12 +173,12 @@ class QtDisplayManager {
         m_activity.getWindow().getDecorView().setSystemUiVisibility(systemUiVisibilityFlags);
     }
 
-    public int systemUiVisibility()
+    int systemUiVisibility()
     {
         return m_systemUiVisibility;
     }
 
-    public void updateFullScreen()
+    void updateFullScreen()
     {
         if (m_systemUiVisibility == SYSTEM_UI_VISIBILITY_FULLSCREEN) {
             m_systemUiVisibility = SYSTEM_UI_VISIBILITY_NORMAL;
@@ -187,7 +187,7 @@ class QtDisplayManager {
     }
 
     @UsedFromNativeCode
-    public static Display getDisplay(Context context, int displayId)
+    static Display getDisplay(Context context, int displayId)
     {
         DisplayManager displayManager =
                 (DisplayManager)context.getSystemService(Context.DISPLAY_SERVICE);
@@ -198,7 +198,7 @@ class QtDisplayManager {
     }
 
     @UsedFromNativeCode
-    public static List<Display> getAvailableDisplays(Context context)
+    static List<Display> getAvailableDisplays(Context context)
     {
         DisplayManager displayManager =
                 (DisplayManager)context.getSystemService(Context.DISPLAY_SERVICE);
@@ -210,7 +210,7 @@ class QtDisplayManager {
     }
 
     @UsedFromNativeCode
-    public static Size getDisplaySize(Context displayContext, Display display)
+    static Size getDisplaySize(Context displayContext, Display display)
     {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
             DisplayMetrics realMetrics = new DisplayMetrics();
@@ -227,7 +227,7 @@ class QtDisplayManager {
         return new Size(bounds.width(), bounds.height());
     }
 
-    public static void setApplicationDisplayMetrics(Activity activity, int width, int height)
+    static void setApplicationDisplayMetrics(Activity activity, int width, int height)
     {
         if (activity == null)
             return;
@@ -273,13 +273,13 @@ class QtDisplayManager {
                 scaledDensity, density, getRefreshRate(display));
     }
 
-    public static float getXDpi(final DisplayMetrics metrics) {
+    static float getXDpi(final DisplayMetrics metrics) {
         if (metrics.xdpi < android.util.DisplayMetrics.DENSITY_LOW)
             return android.util.DisplayMetrics.DENSITY_LOW;
         return metrics.xdpi;
     }
 
-    public static float getYDpi(final DisplayMetrics metrics) {
+    static float getYDpi(final DisplayMetrics metrics) {
         if (metrics.ydpi < android.util.DisplayMetrics.DENSITY_LOW)
             return android.util.DisplayMetrics.DENSITY_LOW;
         return metrics.ydpi;
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtEditText.java b/src/android/jar/src/org/qtproject/qt/android/QtEditText.java
index 71b44a81e5f..e4fa4b99427 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtEditText.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtEditText.java
@@ -49,7 +49,7 @@ class QtEditText extends View
 
     private final QtInputConnectionListener m_qtInputConnectionListener;
 
-    public QtEditText(Context context, QtInputConnectionListener listener)
+    QtEditText(Context context, QtInputConnectionListener listener)
     {
         super(context);
         setFocusable(true);
@@ -115,7 +115,7 @@ class QtEditText extends View
     }
 
 
-    public void setEditTextOptions(int enterKeyType, int inputHints)
+    void setEditTextOptions(int enterKeyType, int inputHints)
     {
         int initialCapsMode = 0;
         int imeOptions = imeOptionsFromEnterKeyType(enterKeyType);
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java
index 7559d5078d9..7a460ccc178 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java
@@ -34,7 +34,7 @@ class QtEmbeddedDelegate extends QtActivityDelegateBase
     private boolean m_windowLoaded = false;
     private boolean m_backendsRegistered = false;
 
-    public QtEmbeddedDelegate(Activity context) {
+    QtEmbeddedDelegate(Activity context) {
         super(context);
 
         m_stateDetails = QtNative.getStateDetails();
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedLoader.java
index 69ecced7ff4..7599a3ab273 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedLoader.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedLoader.java
@@ -34,7 +34,7 @@ import android.content.res.Resources;
 class QtEmbeddedLoader extends QtLoader {
     private static final String TAG = "QtEmbeddedLoader";
 
-    public QtEmbeddedLoader(Context context) {
+    QtEmbeddedLoader(Context context) {
         super(new ContextWrapper(context));
         // TODO Service context handling QTBUG-118874
         int displayDensity = m_context.getResources().getDisplayMetrics().densityDpi;
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedViewInterfaceFactory.java b/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedViewInterfaceFactory.java
index 8a5764e93fe..4ba337e19ff 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedViewInterfaceFactory.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedViewInterfaceFactory.java
@@ -13,7 +13,7 @@ class QtEmbeddedViewInterfaceFactory {
     private static final HashMap<Context, QtEmbeddedViewInterface> m_interfaces = new HashMap<>();
     private static final Object m_interfaceLock = new Object();
 
-    public static QtEmbeddedViewInterface create(Context context) {
+    static QtEmbeddedViewInterface create(Context context) {
         synchronized (m_interfaceLock) {
             if (!m_interfaces.containsKey(context)) {
                 if (context instanceof Activity)
@@ -26,7 +26,7 @@ class QtEmbeddedViewInterfaceFactory {
         }
     }
 
-    public static void remove(Context context) {
+    static void remove(Context context) {
         synchronized (m_interfaceLock) {
             m_interfaces.remove(context);
         }
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java b/src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java
index b95f817d33e..845f7c5e8d3 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java
@@ -20,12 +20,12 @@ import android.util.DisplayMetrics;
 
 class QtExtractedText
 {
-    public int partialEndOffset;
-    public int partialStartOffset;
-    public int selectionEnd;
-    public int selectionStart;
-    public int startOffset;
-    public String text;
+    int partialEndOffset;
+    int partialStartOffset;
+    int selectionEnd;
+    int selectionStart;
+    int startOffset;
+    String text;
 }
 
 class QtNativeInputConnection
@@ -100,7 +100,7 @@ class QtInputConnection extends BaseInputConnection
         }
     }
 
-    public interface QtInputConnectionListener {
+    interface QtInputConnectionListener {
         void onSetClosing(boolean closing);
         void onHideKeyboardRunnableDone(boolean visibility, long hideTimeStamp);
         void onSendKeyEventDefaultCase();
@@ -117,7 +117,7 @@ class QtInputConnection extends BaseInputConnection
             m_qtInputConnectionListener.onSetClosing(false);
     }
 
-    public QtInputConnection(QtEditText targetView, QtInputConnectionListener listener)
+    QtInputConnection(QtEditText targetView, QtInputConnectionListener listener)
     {
         super(targetView, true);
         m_view = targetView;
@@ -126,7 +126,7 @@ class QtInputConnection extends BaseInputConnection
         m_qtInputConnectionListener = listener;
     }
 
-    public void restartImmInput()
+    void restartImmInput()
     {
         if (QtNativeInputConnection.fullscreenMode()) {
             if (m_imm != null)
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtInputDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtInputDelegate.java
index bf5578285a4..3a879776c2a 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtInputDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtInputDelegate.java
@@ -25,19 +25,19 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt
 {
 
     // keyboard methods
-    public static native void keyDown(int key, int unicode, int modifier, boolean autoRepeat);
-    public static native void keyUp(int key, int unicode, int modifier, boolean autoRepeat);
-    public static native void keyboardVisibilityChanged(boolean visibility);
-    public static native void keyboardGeometryChanged(int x, int y, int width, int height);
+    static native void keyDown(int key, int unicode, int modifier, boolean autoRepeat);
+    static native void keyUp(int key, int unicode, int modifier, boolean autoRepeat);
+    static native void keyboardVisibilityChanged(boolean visibility);
+    static native void keyboardGeometryChanged(int x, int y, int width, int height);
     // keyboard methods
 
     // dispatch events methods
-    public static native boolean dispatchGenericMotionEvent(MotionEvent event);
-    public static native boolean dispatchKeyEvent(KeyEvent event);
+    static native boolean dispatchGenericMotionEvent(MotionEvent event);
+    static native boolean dispatchKeyEvent(KeyEvent event);
     // dispatch events methods
 
     // handle methods
-    public static native void handleLocationChanged(int id, int x, int y);
+    static native void handleLocationChanged(int id, int x, int y);
     // handle methods
 
     private QtEditText m_currentEditText = null;
@@ -63,9 +63,9 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt
     private static final int CursorHandleShowEdit       = 0x100;
 
     // Handle IDs
-    public static final int IdCursorHandle = 1;
-    public static final int IdLeftHandle = 2;
-    public static final int IdRightHandle = 3;
+    static final int IdCursorHandle = 1;
+    static final int IdLeftHandle = 2;
+    static final int IdRightHandle = 3;
 
     private static Boolean m_tabletEventSupported = null;
 
@@ -79,7 +79,7 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt
     // Note: because of the circular call to updateFullScreen() from the delegate, we need
     // a listener to be able to do that call from the delegate, because that's where that
     // logic lives
-    public interface KeyboardVisibilityListener {
+    interface KeyboardVisibilityListener {
         void onKeyboardVisibilityChange();
     }
 
@@ -243,7 +243,7 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt
     }
     // QtInputConnectionListener methods
 
-    public boolean isKeyboardVisible()
+    boolean isKeyboardVisible()
     {
         return m_keyboardIsVisible;
     }
@@ -269,7 +269,7 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt
         QtInputDelegate.keyboardVisibilityChanged(visibility);
     }
 
-    public void setKeyboardVisibility(boolean visibility, long timeStamp)
+    void setKeyboardVisibility(boolean visibility, long timeStamp)
     {
         if (m_showHideTimeStamp > timeStamp)
             return;
@@ -427,7 +427,7 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt
         }
     }
 
-    public boolean onKeyDown(int keyCode, KeyEvent event)
+    boolean onKeyDown(int keyCode, KeyEvent event)
     {
         m_metaState = MetaKeyKeyListener.handleKeyDown(m_metaState, keyCode, event);
         int metaState = MetaKeyKeyListener.getMetaState(m_metaState) | event.getMetaState();
@@ -459,7 +459,7 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt
         return true;
     }
 
-    public boolean onKeyUp(int keyCode, KeyEvent event)
+    boolean onKeyUp(int keyCode, KeyEvent event)
     {
         if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP
                 || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
@@ -481,7 +481,7 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt
         return true;
     }
 
-    public boolean handleDispatchKeyEvent(KeyEvent event)
+    boolean handleDispatchKeyEvent(KeyEvent event)
     {
         if (event.getAction() == KeyEvent.ACTION_MULTIPLE
                 && event.getCharacters() != null
@@ -496,7 +496,7 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt
         return dispatchKeyEvent(event);
     }
 
-    public boolean handleDispatchGenericMotionEvent(MotionEvent event)
+    boolean handleDispatchGenericMotionEvent(MotionEvent event)
     {
         return dispatchGenericMotionEvent(event);
     }
@@ -506,24 +506,24 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt
     //////////////////////////////
 
     // tablet methods
-    public static native boolean isTabletEventSupported();
-    public static native void tabletEvent(int winId, int deviceId, long time, int action,
+    static native boolean isTabletEventSupported();
+    static native void tabletEvent(int winId, int deviceId, long time, int action,
                                           int pointerType, int buttonState, float x, float y,
                                           float pressure);
     // tablet methods
 
     // pointer methods
-    public static native void mouseDown(int winId, int x, int y, int mouseButtonState);
-    public static native void mouseUp(int winId, int x, int y, int mouseButtonState);
-    public static native void mouseMove(int winId, int x, int y);
-    public static native void mouseWheel(int winId, int x, int y, float hDelta, float vDelta);
-    public static native void touchBegin(int winId);
-    public static native void touchAdd(int winId, int pointerId, int action, boolean primary,
+    static native void mouseDown(int winId, int x, int y, int mouseButtonState);
+    static native void mouseUp(int winId, int x, int y, int mouseButtonState);
+    static native void mouseMove(int winId, int x, int y);
+    static native void mouseWheel(int winId, int x, int y, float hDelta, float vDelta);
+    static native void touchBegin(int winId);
+    static native void touchAdd(int winId, int pointerId, int action, boolean primary,
                                        int x, int y, float major, float minor, float rotation,
                                        float pressure);
-    public static native void touchEnd(int winId, int action);
-    public static native void touchCancel(int winId);
-    public static native void longPress(int winId, int x, int y);
+    static native void touchEnd(int winId, int action);
+    static native void touchCancel(int winId);
+    static native void longPress(int winId, int x, int y);
     // pointer methods
 
     static private int getAction(int index, MotionEvent event)
@@ -553,7 +553,7 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt
         return 2;
     }
 
-    static public void sendTouchEvent(MotionEvent event, int id)
+    static void sendTouchEvent(MotionEvent event, int id)
     {
         int pointerType = 0;
 
@@ -609,12 +609,12 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt
         }
     }
 
-    static public void sendTrackballEvent(MotionEvent event, int id)
+    static void sendTrackballEvent(MotionEvent event, int id)
     {
         sendMouseEvent(event,id);
     }
 
-    static public boolean sendGenericMotionEvent(MotionEvent event, int id)
+    static boolean sendGenericMotionEvent(MotionEvent event, int id)
     {
         int scrollOrHoverMove = MotionEvent.ACTION_SCROLL | MotionEvent.ACTION_HOVER_MOVE;
         int pointerDeviceModifier = (event.getSource() & InputDevice.SOURCE_CLASS_POINTER);
@@ -626,7 +626,7 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt
         return sendMouseEvent(event, id);
     }
 
-    static public boolean sendMouseEvent(MotionEvent event, int id)
+    static boolean sendMouseEvent(MotionEvent event, int id)
     {
         switch (event.getActionMasked()) {
             case MotionEvent.ACTION_UP:
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 aedc845014a..95c62d58c40 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtLayout.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtLayout.java
@@ -16,17 +16,17 @@ import android.view.ViewGroup;
 
 class QtLayout extends ViewGroup {
 
-    public QtLayout(Context context)
+    QtLayout(Context context)
     {
         super(context);
     }
 
-    public QtLayout(Context context, AttributeSet attrs)
+    QtLayout(Context context, AttributeSet attrs)
     {
         super(context, attrs);
     }
 
-    public QtLayout(Context context, AttributeSet attrs, int defStyle)
+    QtLayout(Context context, AttributeSet attrs, int defStyle)
     {
         super(context, attrs, defStyle);
     }
@@ -126,16 +126,16 @@ class QtLayout extends ViewGroup {
     * See {android.R.styleable#AbsoluteLayout_Layout Absolute Layout Attributes}
     * for a list of all child view attributes that this class supports.
     */
-    public static class LayoutParams extends ViewGroup.LayoutParams
+    static class LayoutParams extends ViewGroup.LayoutParams
     {
         /**
         * The horizontal, or X, location of the child within the view group.
         */
-        public int x;
+        int x;
         /**
         * The vertical, or Y, location of the child within the view group.
         */
-        public int y;
+        int y;
 
         /**
         * Creates a new set of layout parameters with the specified width,
@@ -148,14 +148,14 @@ class QtLayout extends ViewGroup {
         * @param x the X location of the child
         * @param y the Y location of the child
         */
-        public LayoutParams(int width, int height, int x, int y)
+        LayoutParams(int width, int height, int x, int y)
         {
             super(width, height);
             this.x = x;
             this.y = y;
         }
 
-        public LayoutParams(int width, int height)
+        LayoutParams(int width, int height)
         {
             super(width, height);
         }
@@ -163,13 +163,13 @@ class QtLayout extends ViewGroup {
         /**
         * {@inheritDoc}
         */
-        public LayoutParams(ViewGroup.LayoutParams source)
+        LayoutParams(ViewGroup.LayoutParams source)
         {
             super(source);
         }
     }
 
-    public void moveChild(View view, int index)
+    void moveChild(View view, int index)
     {
         if (view == null)
             return;
@@ -189,7 +189,7 @@ class QtLayout extends ViewGroup {
     * Note: This function adds the child view if it's not in the
     *       layout already.
     */
-    public void setLayoutParams(final View childView,
+    void setLayoutParams(final View childView,
                                 final ViewGroup.LayoutParams params,
                                 final boolean forceRedraw)
     {
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java b/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java
index e13abbbadde..068b6b99040 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java
@@ -52,13 +52,13 @@ class ButtonStruct implements View.OnClickListener
 class QtMessageDialogHelper
 {
 
-    public QtMessageDialogHelper(Activity activity)
+    QtMessageDialogHelper(Activity activity)
     {
         m_activity = activity;
     }
 
     @UsedFromNativeCode
-    public void setStandardIcon(int icon)
+    void setStandardIcon(int icon)
     {
         m_standardIcon = icon;
 
@@ -89,31 +89,31 @@ class QtMessageDialogHelper
     }
 
     @UsedFromNativeCode
-    public void setTile(String title)
+    void setTile(String title)
     {
         m_title = Html.fromHtml(title);
     }
 
     @UsedFromNativeCode
-    public void setText(String text)
+    void setText(String text)
     {
         m_text = Html.fromHtml(text);
     }
 
     @UsedFromNativeCode
-    public void setInformativeText(String informativeText)
+    void setInformativeText(String informativeText)
     {
         m_informativeText = Html.fromHtml(informativeText);
     }
 
     @UsedFromNativeCode
-    public void setDetailedText(String text)
+    void setDetailedText(String text)
     {
         m_detailedText = Html.fromHtml(text);
     }
 
     @UsedFromNativeCode
-    public void addButton(int id, String text)
+    void addButton(int id, String text)
     {
         if (m_buttonsList == null)
             m_buttonsList = new ArrayList<>();
@@ -130,7 +130,7 @@ class QtMessageDialogHelper
     }
 
     @UsedFromNativeCode
-    public void show(long handler)
+    void show(long handler)
     {
         m_handler = handler;
         m_activity.runOnUiThread(() -> {
@@ -299,7 +299,7 @@ class QtMessageDialogHelper
     }
 
     @UsedFromNativeCode
-    public void hide()
+    void hide()
     {
         m_activity.runOnUiThread(() -> {
             if (m_dialog != null && m_dialog.isShowing())
@@ -308,12 +308,12 @@ class QtMessageDialogHelper
         });
     }
 
-    public long handler()
+    long handler()
     {
         return m_handler;
     }
 
-    public void reset()
+    void reset()
     {
         m_standardIcon = 0;
         m_title = null;
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtRootLayout.java b/src/android/jar/src/org/qtproject/qt/android/QtRootLayout.java
index b8743d5ce09..21f4e635d15 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtRootLayout.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtRootLayout.java
@@ -20,7 +20,7 @@ class QtRootLayout extends QtLayout
 {
     private int m_previousRotation = -1;
 
-    public QtRootLayout(Context context)
+    QtRootLayout(Context context)
     {
         super(context);
     }
@@ -51,7 +51,7 @@ class QtRootLayout extends QtLayout
         }
     }
 
-    public boolean isSameSizeForOrientations(int r1, int r2) {
+    boolean isSameSizeForOrientations(int r1, int r2) {
         return (r1 == r2) ||
                 (r1 == Surface.ROTATION_0 && r2 == Surface.ROTATION_180)
                 || (r1 == Surface.ROTATION_180 && r2 == Surface.ROTATION_0)
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtServiceLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtServiceLoader.java
index ce74ec21e77..751519f0457 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtServiceLoader.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtServiceLoader.java
@@ -11,7 +11,7 @@ import android.util.Log;
 class QtServiceLoader extends QtLoader {
     private final Service m_service;
 
-    public QtServiceLoader(Service service) {
+    QtServiceLoader(Service service) {
         super(new ContextWrapper(service));
         m_service = service;
 
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 e20974eeac7..f4ca3947d44 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtSurface.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtSurface.java
@@ -16,7 +16,7 @@ class QtSurface extends SurfaceView implements SurfaceHolder.Callback
 {
     private final QtSurfaceInterface m_surfaceCallback;
 
-    public QtSurface(Context context, QtSurfaceInterface surfaceCallback, boolean onTop, int imageDepth)
+    QtSurface(Context context, QtSurfaceInterface surfaceCallback, boolean onTop, int imageDepth)
     {
         super(context);
         setFocusable(false);
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtTextureView.java b/src/android/jar/src/org/qtproject/qt/android/QtTextureView.java
index 95370f3e4ba..67a533b55ba 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtTextureView.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtTextureView.java
@@ -16,7 +16,7 @@ class QtTextureView extends TextureView implements TextureView.SurfaceTextureLis
     private boolean m_staysOnTop;
     private Surface m_surface;
 
-    public QtTextureView(Context context, QtSurfaceInterface surfaceCallback, boolean isOpaque)
+    QtTextureView(Context context, QtSurfaceInterface surfaceCallback, boolean isOpaque)
     {
         super(context);
         setFocusable(false);
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtThread.java b/src/android/jar/src/org/qtproject/qt/android/QtThread.java
index 0943ad32655..aacefe0ee15 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtThread.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtThread.java
@@ -35,14 +35,14 @@ class QtThread {
         m_qtThread.start();
     }
 
-    public void post(final Runnable runnable) {
+    void post(final Runnable runnable) {
         synchronized (m_qtThread) {
             m_pendingRunnables.add(runnable);
             m_qtThread.notify();
         }
     }
 
-    public void sleep(int milliseconds) {
+    void sleep(int milliseconds) {
         try {
             m_qtThread.sleep(milliseconds);
         } catch (InterruptedException e) {
@@ -50,7 +50,7 @@ class QtThread {
         }
     }
 
-    public void run(final Runnable runnable) {
+    void run(final Runnable runnable) {
         final Semaphore sem = new Semaphore(0);
         synchronized (m_qtThread) {
             m_pendingRunnables.add(() -> {
@@ -66,7 +66,7 @@ class QtThread {
         }
     }
 
-    public void exit()
+    void exit()
     {
         m_exit = true;
         synchronized (m_qtThread) {
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtView.java b/src/android/jar/src/org/qtproject/qt/android/QtView.java
index b4fa0382ed9..cf06ce5e3d7 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtView.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtView.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
 abstract class QtView extends ViewGroup {
     private final static String TAG = "QtView";
 
-    public interface QtWindowListener {
+    interface QtWindowListener {
         // Called when the QWindow has been created and it's Java counterpart embedded into
         // QtView
         void onQtWindowLoaded();
@@ -49,7 +49,7 @@ abstract class QtView extends ViewGroup {
     * the Qt app.
     * @param context the hosting Context
    **/
-    public QtView(Context context) {
+    QtView(Context context) {
         super(context);
 
         m_viewInterface = QtEmbeddedViewInterfaceFactory.create(context);
@@ -77,7 +77,7 @@ abstract class QtView extends ViewGroup {
      * @param appLibName the name of the Qt app library to load and start. This corresponds to the
               target name set in Qt app's CMakeLists.txt
     **/
-    public QtView(Context context, String appLibName) throws InvalidParameterException {
+    QtView(Context context, String appLibName) throws InvalidParameterException {
         this(context);
         if (appLibName == null || appLibName.isEmpty()) {
             throw new InvalidParameterException("QtView: argument 'appLibName' may not be empty "+
@@ -138,7 +138,7 @@ abstract class QtView extends ViewGroup {
     }
 
 
-    public void setQtWindowListener(QtWindowListener listener) {
+    void setQtWindowListener(QtWindowListener listener) {
         m_windowListener = listener;
     }
 
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 2a9daa5d021..3b8fe4b1e96 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtWindow.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtWindow.java
@@ -23,7 +23,7 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
     private static native void setSurface(int windowId, Surface surface);
     static native void windowFocusChanged(boolean hasFocus, int id);
 
-    public QtWindow(Context context, QtWindow parentWindow,
+    QtWindow(Context context, QtWindow parentWindow,
                     QtInputConnection.QtInputConnectionListener listener)
     {
         super(context);
@@ -86,14 +86,14 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
     }
 
     @UsedFromNativeCode
-    public void removeWindow()
+    void removeWindow()
     {
         if (m_parentWindow != null)
             m_parentWindow.removeChildWindow(getId());
     }
 
     @UsedFromNativeCode
-    public void createSurface(final boolean onTop,
+    void createSurface(final boolean onTop,
                               final int x, final int y, final int w, final int h,
                               final int imageDepth, final boolean isOpaque,
                               final int surfaceContainerType) // TODO constant for type
@@ -119,7 +119,7 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
     }
 
     @UsedFromNativeCode
-    public void destroySurface()
+    void destroySurface()
     {
         QtNative.runAction(()-> {
             if (m_surfaceContainer != null) {
@@ -130,7 +130,7 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
     }
 
     @UsedFromNativeCode
-    public void setGeometry(final int x, final int y, final int w, final int h)
+    void setGeometry(final int x, final int y, final int w, final int h)
     {
         QtNative.runAction(()-> {
             if (getContext() instanceof QtActivityBase)
@@ -138,7 +138,7 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
         });
     }
 
-    public void addChildWindow(QtWindow window)
+    void addChildWindow(QtWindow window)
     {
         QtNative.runAction(()-> {
             m_childWindows.put(window.getId(), window);
@@ -146,7 +146,7 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
         });
     }
 
-    public void removeChildWindow(int id)
+    void removeChildWindow(int id)
     {
         QtNative.runAction(()-> {
             if (m_childWindows.containsKey(id))
@@ -155,7 +155,7 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
     }
 
     @UsedFromNativeCode
-    public void setNativeView(final View view,
+    void setNativeView(final View view,
                               final int x, final int y, final int w, final int h)
     {
         QtNative.runAction(()-> {
@@ -171,7 +171,7 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
     }
 
     @UsedFromNativeCode
-    public void bringChildToFront(int id)
+    void bringChildToFront(int id)
     {
         QtNative.runAction(()-> {
             View view = m_childWindows.get(id);
@@ -183,7 +183,7 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
     }
 
     @UsedFromNativeCode
-    public void bringChildToBack(int id) {
+    void bringChildToBack(int id) {
         QtNative.runAction(()-> {
             View view = m_childWindows.get(id);
             if (view != null) {
@@ -193,7 +193,7 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
     }
 
     @UsedFromNativeCode
-    public void removeNativeView()
+    void removeNativeView()
     {
         QtNative.runAction(()-> {
             if (m_nativeView != null) {