Android: accessiblity deprecation warnings

Pick-to: 6.10
Change-Id: Idebf0f6ecb8c9ae342932d4f8fd042f79d304693
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>

Author: Issam-b

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

@@ -242,7 +242,7 @@ void notifyValueChanged(int viewId, String value)
             }
 
             final AccessibilityEvent event =
-                    AccessibilityEvent.obtain(AccessibilityEvent.TYPE_ANNOUNCEMENT);
+                    obtainAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT);
 
             event.setEnabled(true);
             event.setClassName(getNodeForVirtualViewId(viewId).getClassName());
@@ -285,7 +285,7 @@ void notifyAnnouncementEvent(int viewId, String message)
             }
 
             final AccessibilityEvent event =
-                    AccessibilityEvent.obtain(AccessibilityEvent.TYPE_ANNOUNCEMENT);
+                    obtainAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT);
             event.getText().add(message);
             event.setClassName(getNodeForVirtualViewId(viewId).getClassName());
             event.setPackageName(m_view.getContext().getPackageName());
@@ -349,7 +349,7 @@ private AccessibilityEvent getEventForVirtualViewId(int virtualViewId, int event
         if (m_layout == null || m_layout.getChildCount() == 0)
             return null;
 
-        final AccessibilityEvent event = AccessibilityEvent.obtain(eventType);
+        final AccessibilityEvent event = obtainAccessibilityEvent(eventType);
 
         event.setEnabled(true);
         event.setClassName(getNodeForVirtualViewId(virtualViewId).getClassName());
@@ -380,12 +380,12 @@ private void dumpNodes(int parentId)
     private AccessibilityNodeInfo getNodeForView()
     {
         if (m_view == null || m_layout == null)
-            return AccessibilityNodeInfo.obtain();
+            return obtainAccessibilityNodeInfo();
 
         // Since we don't want the parent to be focusable, but we can't remove
         // actions from a node, copy over the necessary fields.
-        final AccessibilityNodeInfo result = AccessibilityNodeInfo.obtain(m_view);
-        final AccessibilityNodeInfo source = AccessibilityNodeInfo.obtain(m_view);
+        final AccessibilityNodeInfo result = obtainAccessibilityNodeInfo(m_view);
+        final AccessibilityNodeInfo source = obtainAccessibilityNodeInfo(m_view);
         m_view.onInitializeAccessibilityNodeInfo(source);
 
         // Get the actual position on screen, taking the status bar into account.
@@ -395,8 +395,8 @@ private AccessibilityNodeInfo getNodeForView()
 
         // Copy over parent and screen bounds.
         final Rect m_tempParentRect = new Rect();
-        source.getBoundsInParent(m_tempParentRect);
-        result.setBoundsInParent(m_tempParentRect);
+        getBoundsInParent(source, m_tempParentRect);
+        setBoundsInParent(result, m_tempParentRect);
 
         final Rect m_tempScreenRect = new Rect();
         source.getBoundsInScreen(m_tempScreenRect);
@@ -444,9 +444,9 @@ private AccessibilityNodeInfo getNodeForView()
     private AccessibilityNodeInfo getNodeForVirtualViewId(int virtualViewId)
     {
         if (m_view == null || m_layout == null)
-            return AccessibilityNodeInfo.obtain();
+            return obtainAccessibilityNodeInfo();
 
-        final AccessibilityNodeInfo node = AccessibilityNodeInfo.obtain();
+        final AccessibilityNodeInfo node = obtainAccessibilityNodeInfo();
 
         node.setPackageName(m_view.getContext().getPackageName());
 
@@ -471,7 +471,7 @@ private AccessibilityNodeInfo getNodeForVirtualViewId(int virtualViewId)
 
         Rect parentScreenRect = QtNativeAccessibility.screenRect(parentId);
         screenRect.offset(-parentScreenRect.left, -parentScreenRect.top);
-        node.setBoundsInParent(screenRect);
+        setBoundsInParent(node, screenRect);
 
         // Manage internal accessibility focus state.
         if (m_focusedVirtualViewId == virtualViewId) {
@@ -486,11 +486,7 @@ private AccessibilityNodeInfo getNodeForVirtualViewId(int virtualViewId)
         for (int id : ids)
             node.addChild(m_view, id);
         if (node.isScrollable()) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                node.setCollectionInfo(new CollectionInfo(ids.length, 1, false));
-            } else {
-                node.setCollectionInfo(CollectionInfo.obtain(ids.length, 1, false));
-            }
+            setCollectionInfo(node, ids.length, 1, false);
         }
 
         return node;
@@ -584,4 +580,51 @@ protected boolean performActionForVirtualViewId(int virtualViewId, int action)
         }
         return success;
     }
+
+    @SuppressWarnings("deprecation")
+    private AccessibilityEvent obtainAccessibilityEvent(int eventType) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            return new AccessibilityEvent(eventType);
+        } else {
+            return AccessibilityEvent.obtain(eventType);
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    private AccessibilityNodeInfo obtainAccessibilityNodeInfo() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            return new AccessibilityNodeInfo();
+        } else {
+            return AccessibilityNodeInfo.obtain();
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    private AccessibilityNodeInfo obtainAccessibilityNodeInfo(View source) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            return new AccessibilityNodeInfo(source);
+        } else {
+            return AccessibilityNodeInfo.obtain(source);
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    private void getBoundsInParent(AccessibilityNodeInfo node, Rect outBounds) {
+        node.getBoundsInParent(outBounds);
+    }
+
+    @SuppressWarnings("deprecation")
+    private void setBoundsInParent(AccessibilityNodeInfo node, Rect bounds) {
+        node.setBoundsInParent(bounds);
+    }
+
+    @SuppressWarnings("deprecation")
+    private void setCollectionInfo(AccessibilityNodeInfo node, int rowCount, int columnCount,
+                                   boolean hierarchical) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            node.setCollectionInfo(new CollectionInfo(rowCount, columnCount, hierarchical));
+        } else {
+            node.setCollectionInfo(CollectionInfo.obtain(rowCount, columnCount, hierarchical));
+        }
+    }
 }