diff --git a/app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt b/app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt
index d94b853f1ef..53cb5fd3b1b 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt
@@ -91,6 +91,10 @@ class ImageRegionSelectionInteractionView @JvmOverloads constructor(
maybeInitializeClickableAreas()
}
+ override fun performClick(): Boolean {
+ return super.performClick()
+ }
+
fun setOnRegionClicked(onRegionClicked: OnClickableAreaClickedListener) {
this.onRegionClicked = onRegionClicked
maybeInitializeClickableAreas()
diff --git a/app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt b/app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt
index 69d599fd2de..5093290768b 100644
--- a/app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt
+++ b/app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt
@@ -30,6 +30,7 @@ class ClickableAreasImage(
if (motionEvent.action == MotionEvent.ACTION_DOWN) {
onPhotoTap(motionEvent.x, motionEvent.y)
}
+ view.performClick()
return@setOnTouchListener false
}
}
@@ -110,10 +111,11 @@ class ClickableAreasImage(
newView.isFocusable = true
newView.isFocusableInTouchMode = true
newView.tag = clickableArea.label
- newView.setOnTouchListener { _, event ->
+ newView.setOnTouchListener { view, event ->
if (event.action == MotionEvent.ACTION_DOWN) {
showOrHideRegion(newView, clickableArea)
}
+ view.performClick()
return@setOnTouchListener true
}
if (isAccessibilityEnabled) {
diff --git a/app/src/main/res/layout-land/profile_chooser_fragment.xml b/app/src/main/res/layout-land/profile_chooser_fragment.xml
index 71ab34ea13a..661da1b5244 100644
--- a/app/src/main/res/layout-land/profile_chooser_fragment.xml
+++ b/app/src/main/res/layout-land/profile_chooser_fragment.xml
@@ -36,7 +36,8 @@
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:srcCompat="@drawable/ic_language_icon_grey_24dp" />
+ app:srcCompat="@drawable/ic_language_icon_grey_24dp"
+ android:contentDescription="@string/language_icon_content_description" />
+ app:srcCompat="@drawable/ic_settings_grey_48dp"
+ android:contentDescription="@string/setting_icon_content_description" />
diff --git a/app/src/main/res/layout-land/topic_info_fragment.xml b/app/src/main/res/layout-land/topic_info_fragment.xml
index 18502150884..6ebd9c406d1 100644
--- a/app/src/main/res/layout-land/topic_info_fragment.xml
+++ b/app/src/main/res/layout-land/topic_info_fragment.xml
@@ -105,7 +105,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/see_more_text_view"
app:srcCompat="@{viewModel.downloadStatusIndicatorDrawableResourceId, default=@drawable/ic_available_offline_primary_24dp}"
- app:tint="@color/component_color_topic_info_fragment_download_status_image_color" />
+ app:tint="@color/component_color_topic_info_fragment_download_status_image_color"
+ android:contentDescription="@string/download_status_image_content_description" />
+ app:srcCompat="@drawable/ic_portrait_onboarding_0"
+ android:importantForAccessibility="no" />
+ app:srcCompat="@drawable/ic_portrait_onboarding_0"
+ android:importantForAccessibility="no" />
+ app:tint="@color/component_color_topic_info_fragment_download_status_image_color"
+ android:contentDescription="@string/download_status_image_content_description" />
+ app:tint="@color/component_color_topic_info_fragment_download_status_image_color"
+ android:contentDescription="@string/download_status_image_content_description" />
+ app:srcCompat="@drawable/ic_language_icon_grey_24dp"
+ android:contentDescription="@string/language_icon_content_description" />
+ app:srcCompat="@drawable/ic_settings_grey_48dp"
+ android:contentDescription="@string/setting_icon_content_description" />
diff --git a/app/src/main/res/layout-sw600dp/story_chapter_view.xml b/app/src/main/res/layout-sw600dp/story_chapter_view.xml
index b4d65ef1c45..64800254214 100644
--- a/app/src/main/res/layout-sw600dp/story_chapter_view.xml
+++ b/app/src/main/res/layout-sw600dp/story_chapter_view.xml
@@ -115,7 +115,8 @@
app:layout_constraintEnd_toEndOf="@id/chapter_thumbnail"
app:layout_constraintStart_toStartOf="@id/chapter_thumbnail"
app:layout_constraintTop_toTopOf="@id/chapter_thumbnail"
- app:srcCompat="@drawable/ic_baseline_lock_24" />
+ app:srcCompat="@drawable/ic_baseline_lock_24"
+ android:contentDescription="@string/lock_icon_content_description" />
+ app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp"
+ android:importantForAccessibility="no" />
diff --git a/app/src/main/res/layout/app_version_fragment.xml b/app/src/main/res/layout/app_version_fragment.xml
index 4577da4eed2..32ddf6d236f 100644
--- a/app/src/main/res/layout/app_version_fragment.xml
+++ b/app/src/main/res/layout/app_version_fragment.xml
@@ -40,7 +40,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/app_last_update_date_text_view"
app:srcCompat="@drawable/ic_info_icon_gray_24dp"
- app:tint="@color/component_color_app_version_activity_info_icon_color" />
+ app:tint="@color/component_color_app_version_activity_info_icon_color"
+ android:contentDescription="@string/app_info_icon_content_description" />
+ app:tint="@color/component_color_shared_spotlight_overlay_arrow_color"
+ android:contentDescription="@string/spotlight_overlay_arrow_content_description" />
+ app:tint="@color/component_color_shared_close_spotlight_button_color"
+ android:contentDescription="@string/close_spotlight_button_content_description" />
diff --git a/app/src/main/res/layout/bottom_right_overlay.xml b/app/src/main/res/layout/bottom_right_overlay.xml
index d93caa2ad2c..9e300abdf98 100644
--- a/app/src/main/res/layout/bottom_right_overlay.xml
+++ b/app/src/main/res/layout/bottom_right_overlay.xml
@@ -26,7 +26,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_rounded_arrow_up_right"
- app:tint="@color/component_color_shared_spotlight_overlay_arrow_color" />
+ app:tint="@color/component_color_shared_spotlight_overlay_arrow_color"
+ android:contentDescription="@string/spotlight_overlay_arrow_content_description" />
+ app:tint="@color/component_color_shared_close_spotlight_button_color"
+ android:contentDescription="@string/close_spotlight_button_content_description" />
diff --git a/app/src/main/res/layout/continue_interaction_item.xml b/app/src/main/res/layout/continue_interaction_item.xml
index 1b8d40a5dd7..5ebab739f3d 100644
--- a/app/src/main/res/layout/continue_interaction_item.xml
+++ b/app/src/main/res/layout/continue_interaction_item.xml
@@ -46,7 +46,8 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:tint="@color/component_color_shared_back_forward_arrow_button_color" />
+ app:tint="@color/component_color_shared_back_forward_arrow_button_color"
+ android:contentDescription="@string/previous_state_navigation_button_content_description" />
+ app:tint="@color/component_color_shared_back_forward_arrow_button_color"
+ android:contentDescription="@string/previous_state_navigation_button_content_description" />
+ android:tint="@{footerViewModel.isDeveloperOptionsSelected ? @color/component_color_drawer_fragment_developer_options_selected_image_color : @color/component_color_shared_primary_dark_text_color}"
+ android:contentDescription="@string/developer_options_icon_content_description" />
+ app:srcCompat="@drawable/ic_admin_settings_icon_brown_24dp"
+ android:contentDescription="@string/administrator_controls_icon_content_description" />
+ android:scaleType="center"
+ android:contentDescription="@string/options_menu_content_description" />
diff --git a/app/src/main/res/layout/math_expression_parser_fragment.xml b/app/src/main/res/layout/math_expression_parser_fragment.xml
index b69a79c2ad9..ce6208c4ddf 100644
--- a/app/src/main/res/layout/math_expression_parser_fragment.xml
+++ b/app/src/main/res/layout/math_expression_parser_fragment.xml
@@ -77,6 +77,7 @@
android:background="@drawable/state_button_primary_background"
android:clickable="true"
android:enabled="true"
+ android:focusable="true"
android:onClick="@{(v) -> viewModel.onParseButtonClicked()}"
android:text="@string/math_expression_parse_button_label"
android:textSize="14sp"
diff --git a/app/src/main/res/layout/next_button_item.xml b/app/src/main/res/layout/next_button_item.xml
index f64cf696616..4bf8c53f2fe 100644
--- a/app/src/main/res/layout/next_button_item.xml
+++ b/app/src/main/res/layout/next_button_item.xml
@@ -45,7 +45,8 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:tint="@color/component_color_shared_back_forward_arrow_button_color" />
+ app:tint="@color/component_color_shared_back_forward_arrow_button_color"
+ android:contentDescription="@string/previous_button_content_description" />
+ app:tint="@color/component_color_shared_back_forward_arrow_button_color"
+ android:contentDescription="@string/next_button_content_description" />
diff --git a/app/src/main/res/layout/previous_button_item.xml b/app/src/main/res/layout/previous_button_item.xml
index 96ea50345f7..38865b2aac9 100644
--- a/app/src/main/res/layout/previous_button_item.xml
+++ b/app/src/main/res/layout/previous_button_item.xml
@@ -44,6 +44,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:tint="@color/component_color_shared_back_forward_arrow_button_color" />
+ app:tint="@color/component_color_shared_back_forward_arrow_button_color"
+ android:contentDescription="@string/previous_button_content_description" />
diff --git a/app/src/main/res/layout/profile_chooser_fragment.xml b/app/src/main/res/layout/profile_chooser_fragment.xml
index febeed2e886..c9d667ec8e0 100644
--- a/app/src/main/res/layout/profile_chooser_fragment.xml
+++ b/app/src/main/res/layout/profile_chooser_fragment.xml
@@ -36,7 +36,8 @@
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:srcCompat="@drawable/ic_language_icon_grey_24dp" />
+ app:srcCompat="@drawable/ic_language_icon_grey_24dp"
+ android:contentDescription="@string/language_icon_content_description" />
+ app:srcCompat="@drawable/ic_settings_grey_48dp"
+ android:contentDescription="@string/setting_icon_content_description" />
diff --git a/app/src/main/res/layout/profile_picture_activity.xml b/app/src/main/res/layout/profile_picture_activity.xml
index fcdc2deb08b..82932006341 100644
--- a/app/src/main/res/layout/profile_picture_activity.xml
+++ b/app/src/main/res/layout/profile_picture_activity.xml
@@ -48,7 +48,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/profile_picture_activity_app_bar_layout"
profile:src="@{viewModel.profileAvatar}"
- tools:src="@drawable/ic_default_avatar" />
+ tools:src="@drawable/ic_default_avatar"
+ android:contentDescription="@string/profile_picture_image_view_content_description" />
+ app:tint="@color/component_color_shared_back_forward_arrow_button_color"
+ android:contentDescription="@string/previous_button_content_description" />
+ android:scaleType="center"
+ android:contentDescription="@string/options_menu_content_description" />
+ app:srcCompat="@drawable/ic_baseline_lock_24"
+ android:contentDescription="@string/lock_icon_content_description" />
+ app:tint="@color/component_color_shared_back_forward_arrow_button_color"
+ android:contentDescription="@string/previous_button_content_description" />
+ android:layout_height="320dp"
+ android:importantForAccessibility="no" />
diff --git a/app/src/main/res/layout/test_image_view_bindable_adapter_activity.xml b/app/src/main/res/layout/test_image_view_bindable_adapter_activity.xml
index 296d60643d7..ef6de32b761 100644
--- a/app/src/main/res/layout/test_image_view_bindable_adapter_activity.xml
+++ b/app/src/main/res/layout/test_image_view_bindable_adapter_activity.xml
@@ -2,5 +2,6 @@
+ android:layout_height="32dp"
+ android:importantForAccessibility="no" />
diff --git a/app/src/main/res/layout/test_url_parser_activity.xml b/app/src/main/res/layout/test_url_parser_activity.xml
index eaa0e758a6c..9b0db340bf8 100644
--- a/app/src/main/res/layout/test_url_parser_activity.xml
+++ b/app/src/main/res/layout/test_url_parser_activity.xml
@@ -6,5 +6,6 @@
+ android:layout_height="wrap_content"
+ android:importantForAccessibility="no" />
diff --git a/app/src/main/res/layout/text_input_interaction_item.xml b/app/src/main/res/layout/text_input_interaction_item.xml
index 23c087a6323..e204f674cf6 100644
--- a/app/src/main/res/layout/text_input_interaction_item.xml
+++ b/app/src/main/res/layout/text_input_interaction_item.xml
@@ -1,5 +1,6 @@
-
@@ -21,14 +22,15 @@
+ app:textChangedListener="@{viewModel.answerTextWatcher}"
+ tools:ignore="ContentDescription" />
diff --git a/app/src/main/res/layout/top_left_overlay.xml b/app/src/main/res/layout/top_left_overlay.xml
index fba00994436..d005ea8287c 100644
--- a/app/src/main/res/layout/top_left_overlay.xml
+++ b/app/src/main/res/layout/top_left_overlay.xml
@@ -24,7 +24,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_rounded_arrow_up_right"
- app:tint="@color/component_color_shared_spotlight_overlay_arrow_color" />
+ app:tint="@color/component_color_shared_spotlight_overlay_arrow_color"
+ android:contentDescription="@string/spotlight_overlay_arrow_content_description" />
+ app:tint="@color/component_color_shared_close_spotlight_button_color"
+ android:contentDescription="@string/close_spotlight_button_content_description" />
diff --git a/app/src/main/res/layout/top_right_overlay.xml b/app/src/main/res/layout/top_right_overlay.xml
index 13d17e7c942..9043b9bd3d8 100644
--- a/app/src/main/res/layout/top_right_overlay.xml
+++ b/app/src/main/res/layout/top_right_overlay.xml
@@ -25,7 +25,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_rounded_arrow_up_right"
- app:tint="@color/component_color_shared_spotlight_overlay_arrow_color" />
+ app:tint="@color/component_color_shared_spotlight_overlay_arrow_color"
+ android:contentDescription="@string/spotlight_overlay_arrow_content_description" />
+ app:tint="@color/component_color_shared_close_spotlight_button_color"
+ android:contentDescription="@string/close_spotlight_button_content_description" />
diff --git a/app/src/main/res/layout/topic_info_fragment.xml b/app/src/main/res/layout/topic_info_fragment.xml
index a25f86330d4..47eccc08b25 100644
--- a/app/src/main/res/layout/topic_info_fragment.xml
+++ b/app/src/main/res/layout/topic_info_fragment.xml
@@ -126,7 +126,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/see_more_text_view"
app:srcCompat="@{viewModel.downloadStatusIndicatorDrawableResourceId, default=@drawable/ic_available_offline_primary_24dp}"
- app:tint="@color/component_color_topic_info_fragment_download_status_image_color" />
+ app:tint="@color/component_color_topic_info_fragment_download_status_image_color"
+ android:contentDescription="@string/download_status_image_content_description" />
+ app:srcCompat="@drawable/ic_portrait_onboarding_0"
+ android:importantForAccessibility="no" />
+ app:layout_constraintTop_toBottomOf="@+id/walkthrough_welcome_description_text_view"
+ android:importantForAccessibility="no" />