From 04a9d7fe005e8a353cff04fd747d38b8ee1c0554 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Wed, 30 Oct 2024 14:04:02 +0200
Subject: [PATCH] Android: make accessibility delegate protected memeber

so also we can call it directly from extended classes
without using get() calls.

Change-Id: Ie0aa7509620e3d675816b9efb1db8b092e1c4a8f
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
(cherry picked from commit 48f9ab09464a3e8259ceb75ff13b55901cd74760)
---
 .../qtproject/qt/android/QtActivityDelegate.java   | 14 +++++++-------
 .../qt/android/QtActivityDelegateBase.java         |  6 +-----
 2 files changed, 8 insertions(+), 12 deletions(-)

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 3310f85e083..9c38bc48d3b 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
@@ -247,37 +247,37 @@ class QtActivityDelegate extends QtActivityDelegateBase
     @Override
     public void notifyLocationChange(int viewId)
     {
-        getAccessibilityDelegate().notifyLocationChange(viewId);
+        m_accessibilityDelegate.notifyLocationChange(viewId);
     }
 
     @Override
     public void notifyObjectHide(int viewId, int parentId)
     {
-        getAccessibilityDelegate().notifyObjectHide(viewId, parentId);
+        m_accessibilityDelegate.notifyObjectHide(viewId, parentId);
     }
 
     @Override
     public void notifyObjectShow(int parentId)
     {
-        getAccessibilityDelegate().notifyObjectShow(parentId);
+        m_accessibilityDelegate.notifyObjectShow(parentId);
     }
 
     @Override
     public void notifyObjectFocus(int viewId)
     {
-        getAccessibilityDelegate().notifyObjectFocus(viewId);
+        m_accessibilityDelegate.notifyObjectFocus(viewId);
     }
 
     @Override
     public void notifyValueChanged(int viewId, String value)
     {
-        getAccessibilityDelegate().notifyValueChanged(viewId, value);
+        m_accessibilityDelegate.notifyValueChanged(viewId, value);
     }
 
     @Override
     public void notifyScrolledEvent(int viewId)
     {
-        getAccessibilityDelegate().notifyScrolledEvent(viewId);
+        m_accessibilityDelegate.notifyScrolledEvent(viewId);
     }
 
     @Override
@@ -285,7 +285,7 @@ class QtActivityDelegate extends QtActivityDelegateBase
     {
         QtNative.runAction(() -> {
             // FIXME make QtAccessibilityDelegate window based
-            getAccessibilityDelegate().initLayoutAccessibility(m_layout);
+            m_accessibilityDelegate.initLayoutAccessibility(m_layout);
         });
     }
 
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 1b1c40c1fe0..5bca2bca975 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java
@@ -41,7 +41,7 @@ abstract class QtActivityDelegateBase
     protected final HashMap<Integer, QtWindow> m_topLevelWindows = new HashMap<>();
     protected final QtDisplayManager m_displayManager;
     protected final QtInputDelegate m_inputDelegate;
-    private final QtAccessibilityDelegate m_accessibilityDelegate;
+    protected final QtAccessibilityDelegate m_accessibilityDelegate;
 
     private boolean m_membersInitialized = false;
     private boolean m_contextMenuVisible = false;
@@ -72,10 +72,6 @@ abstract class QtActivityDelegateBase
         return m_inputDelegate;
     }
 
-    QtAccessibilityDelegate getAccessibilityDelegate() {
-        return m_accessibilityDelegate;
-    }
-
     void setContextMenuVisible(boolean contextMenuVisible)
     {
         m_contextMenuVisible = contextMenuVisible;