Android: Delay initialization of Accessibility.

The accessibility class was created and activated in onCreate(), which
meant we where trying to activate accessibility before the platform
plugin was properly initialized.
With this change we will also activate, or deactivate, accessibility in
Qt whenever the state is changed by Android, compared to doing it at
start-up only.

Task-number: QTBUG-46355
Change-Id: I5cbae125df43f7694d4464d5054e6cfec4626e26
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>

1 files changed, 2 insertions, 7 deletions

diff --git a/src/android/accessibility/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java b/src/android/accessibility/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java
index 56e7543415..6f95675597 100644
--- a/src/android/accessibility/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java
+++ b/src/android/accessibility/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java
@@ -107,10 +107,6 @@ public class QtAccessibilityDelegate extends View.AccessibilityDelegate
             if (m_manager.isEnabled())
                 accServiceListener.onAccessibilityStateChanged(true);
         }
-
-
-        // Enable Qt Accessibility so that notifications are enabled
-        QtNativeAccessibility.setActive(true);
     }
 
     private class AccessibilityManagerListener implements AccessibilityManager.AccessibilityStateChangeListener
@@ -119,8 +115,6 @@ public class QtAccessibilityDelegate extends View.AccessibilityDelegate
         public void onAccessibilityStateChanged(boolean enabled)
         {
             if (enabled) {
-                // The accessibility code depends on android API level 16, so dynamically resolve it
-                if (android.os.Build.VERSION.SDK_INT >= 16) {
                     try {
                         View view = m_view;
                         if (view == null) {
@@ -147,13 +141,14 @@ public class QtAccessibilityDelegate extends View.AccessibilityDelegate
                         // Unknown exception means something went wrong.
                         Log.w("Qt A11y", "Unknown exception: " + e.toString());
                     }
-                }
             } else {
                 if (m_view != null) {
                     m_layout.removeView(m_view);
                     m_view = null;
                 }
             }
+
+            QtNativeAccessibility.setActive(enabled);
         }
     }