[hapjs-platform#631]【1300开源版本】无障碍新增组件属性方法(rfc:hapjs-platform#2)

mingcan-mc · Dec 18, 2023 · b3e4fda · b3e4fda
1 parent dda9b58
commit b3e4fda
Show file tree

Hide file tree

Showing 46 changed files with 57 additions and 45 deletions.
diff --git a/core/runtime/android/runtime/src/main/java/org/hapjs/component/RecyclerDataItem.java b/core/runtime/android/runtime/src/main/java/org/hapjs/component/RecyclerDataItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present,  the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/.../android/runtime/src/main/java/org/hapjs/component/view/flexbox/PercentFlexboxLayout.java b/.../android/runtime/src/main/java/org/hapjs/component/view/flexbox/PercentFlexboxLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present,  the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/runtime/src/main/java/org/hapjs/render/TabBar.java b/core/runtime/android/runtime/src/main/java/org/hapjs/render/TabBar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, the hapjs-platform Project Contributors
+ * Copyright (c) 2023-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 package org.hapjs.render;

diff --git a/core/runtime/android/runtime/src/main/java/org/hapjs/runtime/RuntimeActivity.java b/core/runtime/android/runtime/src/main/java/org/hapjs/runtime/RuntimeActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/runtime/src/main/java/org/hapjs/system/utils/TalkBackUtils.java b/core/runtime/android/runtime/src/main/java/org/hapjs/system/utils/TalkBackUtils.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2022, hapjs.org. All rights reserved.
+ * Copyright (c) 2023-present, the hapjs-platform Project Contributors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.hapjs.system.utils;
 

diff --git a/core/runtime/android/runtime/src/main/res/layout/titlebar_view.xml b/core/runtime/android/runtime/src/main/res/layout/titlebar_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-    Copyright (c) 2021-2022, the hapjs-platform Project Contributors
+    Copyright (c) 2021-present, the hapjs-platform Project Contributors
     SPDX-License-Identifier: Apache-2.0
 -->
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/A.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/A.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Div.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Div.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Popup.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Popup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Rating.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Rating.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Refresh.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Refresh.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/ShareButton.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/ShareButton.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, the hapjs-platform Project Contributors
+ * Copyright (c) 2022-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Stack.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Stack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/canvas/Canvas.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/canvas/Canvas.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/drawer/Drawer.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/drawer/Drawer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/drawer/DrawerNavigation.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/drawer/DrawerNavigation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/CheckBox.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/CheckBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Label.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Label.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Radio.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Radio.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Switch.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Switch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/list/ListItem.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/list/ListItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/map/CustomMarker.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/map/CustomMarker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/map/Map.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/map/Map.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/DatePicker.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/DatePicker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/MultiPicker.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/MultiPicker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/TextPicker.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/TextPicker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/TimePicker.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/TimePicker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/progress/CircularProgress.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/progress/CircularProgress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present,  the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/.../runtime/android/widgets/src/main/java/org/hapjs/widgets/progress/HorizontalProgress.java b/.../runtime/android/widgets/src/main/java/org/hapjs/widgets/progress/HorizontalProgress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/Refresh2.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/Refresh2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/RefreshFooter.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/RefreshFooter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/RefreshHeader.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/RefreshHeader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionGroup.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionHeader.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionHeader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionItem.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionList.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/tab/TabContent.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/tab/TabContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/tab/Tabs.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/tab/Tabs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/HtmlText.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/HtmlText.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/RichText.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/RichText.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/image/FlexImageView.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/image/FlexImageView.java
@@ -28,10 +28,12 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
+import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import com.facebook.common.executors.UiThreadImmediateExecutorService;
 import com.facebook.common.util.UriUtil;
@@ -1361,6 +1363,15 @@ public void process(Bitmap output, Bitmap source) {
         }
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    @Override
+    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
+        super.onInitializeAccessibilityNodeInfo(info);
+        info.setClassName("");
+        info.setClickable(false);
+        info.removeAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK);
+    }
+
     private class ImageSizeDetectRequestListener extends BaseRequestListener {
         @Override
         public void onProducerFinishWithSuccess(String requestId, String producerName, @javax.annotation.Nullable Map<String, String> extraMap) {

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/lottie/Lottie.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/lottie/Lottie.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 package org.hapjs.widgets.view.lottie;

diff --git a/...runtime/android/widgets/src/main/java/org/hapjs/widgets/view/swiper/LoopPagerAdapter.java b/...runtime/android/widgets/src/main/java/org/hapjs/widgets/view/swiper/LoopPagerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexCheckBox.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexCheckBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present,  the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexEditText.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexEditText.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 

diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexRadioButton.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexRadioButton.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, the hapjs-platform Project Contributors
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */