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" />