1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: make accessibility delegate protected memeber

Browse Source 
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)
This commit is contained in:
Assam Boudjelthia 2024-10-30 14:04:02 +02:00
parent 7be419bb23
commit 04a9d7fe00
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
View File

@ -247,37 +247,37 @@ class QtActivityDelegate extends QtActivityDelegateBase
@Override @Override
public void notifyLocationChange(int viewId) public void notifyLocationChange(int viewId)
{ {
getAccessibilityDelegate().notifyLocationChange(viewId); m_accessibilityDelegate.notifyLocationChange(viewId);
} }
@Override @Override
public void notifyObjectHide(int viewId, int parentId) public void notifyObjectHide(int viewId, int parentId)
{ {
getAccessibilityDelegate().notifyObjectHide(viewId, parentId); m_accessibilityDelegate.notifyObjectHide(viewId, parentId);
} }
@Override @Override
public void notifyObjectShow(int parentId) public void notifyObjectShow(int parentId)
{ {
getAccessibilityDelegate().notifyObjectShow(parentId); m_accessibilityDelegate.notifyObjectShow(parentId);
} }
@Override @Override
public void notifyObjectFocus(int viewId) public void notifyObjectFocus(int viewId)
{ {
getAccessibilityDelegate().notifyObjectFocus(viewId); m_accessibilityDelegate.notifyObjectFocus(viewId);
} }
@Override @Override
public void notifyValueChanged(int viewId, String value) public void notifyValueChanged(int viewId, String value)
{ {
getAccessibilityDelegate().notifyValueChanged(viewId, value); m_accessibilityDelegate.notifyValueChanged(viewId, value);
} }
@Override @Override
public void notifyScrolledEvent(int viewId) public void notifyScrolledEvent(int viewId)
{ {
getAccessibilityDelegate().notifyScrolledEvent(viewId); m_accessibilityDelegate.notifyScrolledEvent(viewId);
} }
@Override @Override
@ -285,7 +285,7 @@ class QtActivityDelegate extends QtActivityDelegateBase
{ {
QtNative.runAction(() -> { QtNative.runAction(() -> {
// FIXME make QtAccessibilityDelegate window based // FIXME make QtAccessibilityDelegate window based
getAccessibilityDelegate().initLayoutAccessibility(m_layout); m_accessibilityDelegate.initLayoutAccessibility(m_layout);
}); });
} }

6
src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java
View File

@ -41,7 +41,7 @@ abstract class QtActivityDelegateBase
protected final HashMap<Integer, QtWindow> m_topLevelWindows = new HashMap<>(); protected final HashMap<Integer, QtWindow> m_topLevelWindows = new HashMap<>();
protected final QtDisplayManager m_displayManager; protected final QtDisplayManager m_displayManager;
protected final QtInputDelegate m_inputDelegate; protected final QtInputDelegate m_inputDelegate;
private final QtAccessibilityDelegate m_accessibilityDelegate; protected final QtAccessibilityDelegate m_accessibilityDelegate;
private boolean m_membersInitialized = false; private boolean m_membersInitialized = false;
private boolean m_contextMenuVisible = false; private boolean m_contextMenuVisible = false;
@ -72,10 +72,6 @@ abstract class QtActivityDelegateBase
return m_inputDelegate; return m_inputDelegate;
} }
QtAccessibilityDelegate getAccessibilityDelegate() {
return m_accessibilityDelegate;
}
void setContextMenuVisible(boolean contextMenuVisible) void setContextMenuVisible(boolean contextMenuVisible)
{ {
m_contextMenuVisible = contextMenuVisible; m_contextMenuVisible = contextMenuVisible;