From bf0bf746ec04466d9f575e89cade5ada9e6298f9 Mon Sep 17 00:00:00 2001
From: the_mr17 <saptakmanna100@gmail.com>
Date: Mon, 2 Oct 2023 16:35:13 +0530
Subject: [PATCH 1/6] Fixes performClick warnings

---
 .../app/player/state/ImageRegionSelectionInteractionView.kt   | 4 ++++
 .../java/org/oppia/android/app/utility/ClickableAreasImage.kt | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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) {

From d07ddecaf4c0602dbc3b17bbdcf791d1eac58e73 Mon Sep 17 00:00:00 2001
From: the_mr17 <saptakmanna100@gmail.com>
Date: Mon, 2 Oct 2023 16:51:43 +0530
Subject: [PATCH 2/6] Fixes focusable warnings

---
 app/src/main/res/layout/math_expression_parser_fragment.xml | 1 +
 1 file changed, 1 insertion(+)

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"

From d3fdb247a3d455da7e35c2d6ad9006ceb13c4ba3 Mon Sep 17 00:00:00 2001
From: the_mr17 <saptakmanna100@gmail.com>
Date: Mon, 2 Oct 2023 17:36:51 +0530
Subject: [PATCH 3/6] Fixes contentDescription warnings

---
 .../layout-land/profile_chooser_fragment.xml  |  6 ++++--
 .../res/layout-land/topic_info_fragment.xml   |  3 ++-
 .../walkthrough_final_fragment.xml            |  3 ++-
 .../walkthrough_welcome_fragment.xml          |  3 ++-
 .../topic_info_fragment.xml                   |  3 ++-
 .../topic_info_fragment.xml                   |  3 ++-
 .../profile_chooser_fragment.xml              |  6 ++++--
 .../res/layout-sw600dp/story_chapter_view.xml |  3 ++-
 .../activity_view_binding_adapters_test.xml   |  3 ++-
 .../main/res/layout/app_version_fragment.xml  |  3 ++-
 .../main/res/layout/bottom_left_overlay.xml   |  6 ++++--
 .../main/res/layout/bottom_right_overlay.xml  |  6 ++++--
 .../res/layout/continue_interaction_item.xml  |  3 ++-
 .../continue_navigation_button_item.xml       |  3 ++-
 app/src/main/res/layout/drawer_fragment.xml   |  6 ++++--
 .../main/res/layout/exploration_activity.xml  |  3 ++-
 app/src/main/res/layout/next_button_item.xml  |  6 ++++--
 .../main/res/layout/previous_button_item.xml  |  3 ++-
 .../res/layout/profile_chooser_fragment.xml   |  6 ++++--
 .../res/layout/profile_picture_activity.xml   |  3 ++-
 .../layout/return_to_topic_button_item.xml    |  3 ++-
 .../res/layout/revision_card_activity.xml     |  5 +++--
 .../main/res/layout/story_chapter_view.xml    |  3 ++-
 .../main/res/layout/submit_button_item.xml    |  3 ++-
 ...test_drawable_binding_adapter_activity.xml |  3 ++-
 ...t_image_view_bindable_adapter_activity.xml |  3 ++-
 .../res/layout/test_url_parser_activity.xml   |  3 ++-
 .../layout/text_input_interaction_item.xml    |  1 -
 app/src/main/res/layout/top_left_overlay.xml  |  6 ++++--
 app/src/main/res/layout/top_right_overlay.xml |  6 ++++--
 .../main/res/layout/topic_info_fragment.xml   |  3 ++-
 .../res/layout/walkthrough_final_fragment.xml |  3 ++-
 .../layout/walkthrough_welcome_fragment.xml   |  3 ++-
 app/src/main/res/values/strings.xml           | 21 +++++++++++++++++++
 34 files changed, 104 insertions(+), 43 deletions(-)

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" />
 
         <TextView
           style="@style/Subtitle1ViewCenter"
@@ -115,7 +116,8 @@
         android:paddingTop="12dp"
         android:paddingEnd="16dp"
         android:paddingBottom="12dp"
-        app:srcCompat="@drawable/ic_settings_grey_48dp" />
+        app:srcCompat="@drawable/ic_settings_grey_48dp"
+        android:contentDescription="@string/setting_icon_content_description" />
     </LinearLayout>
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
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..33beb578dfb 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_content_description" />
 
       <TextView
         android:id="@+id/download_story_count_text_view"
diff --git a/app/src/main/res/layout-land/walkthrough_final_fragment.xml b/app/src/main/res/layout-land/walkthrough_final_fragment.xml
index 1ae0bbbaed0..88ad550522b 100644
--- a/app/src/main/res/layout-land/walkthrough_final_fragment.xml
+++ b/app/src/main/res/layout-land/walkthrough_final_fragment.xml
@@ -26,7 +26,8 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/ic_portrait_onboarding_0" />
+      app:srcCompat="@drawable/ic_portrait_onboarding_0"
+      android:contentDescription="@string/walkthrough_final_content_description" />
 
     <LinearLayout
       android:id="@+id/walkthrough_button_container"
diff --git a/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml b/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml
index 7ac43a97c01..229a9a637a4 100644
--- a/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml
+++ b/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml
@@ -61,7 +61,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_portrait_onboarding_0" />
+        app:srcCompat="@drawable/ic_portrait_onboarding_0"
+        android:contentDescription="@string/walkthrough_welcome_content_description" />
 
       <Button
         android:id="@+id/walkthrough_welcome_next_button"
diff --git a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml
index 83c153ae9a0..4c1e692b764 100644
--- a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml
@@ -99,7 +99,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_content_description" />
 
         <TextView
           android:id="@+id/download_story_count_text_view"
diff --git a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml
index e1c7aff2967..85ca52e645a 100644
--- a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml
@@ -119,7 +119,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_content_description" />
 
       <TextView
         android:id="@+id/download_story_count_text_view"
diff --git a/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml b/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml
index a6ac88ce249..e1cda79e5df 100644
--- a/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml
@@ -40,7 +40,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" />
 
         <TextView
           style="@style/Subtitle1ViewCenter"
@@ -119,7 +120,8 @@
         android:layout_height="48dp"
         android:layout_marginEnd="@dimen/profile_chooser_setting_icon_margin_end"
         android:padding="8dp"
-        app:srcCompat="@drawable/ic_settings_grey_48dp" />
+        app:srcCompat="@drawable/ic_settings_grey_48dp"
+        android:contentDescription="@string/setting_icon_content_description" />
     </LinearLayout>
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
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" />
 
           <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_view_binding_adapters_test.xml b/app/src/main/res/layout/activity_view_binding_adapters_test.xml
index 1ea2f715569..49126117427 100644
--- a/app/src/main/res/layout/activity_view_binding_adapters_test.xml
+++ b/app/src/main/res/layout/activity_view_binding_adapters_test.xml
@@ -16,6 +16,7 @@
       android:layout_height="48dp"
       android:layout_gravity="center_vertical"
       android:padding="8dp"
-      app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp" />
+      app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp"
+      android:contentDescription="@string/test_drop_down_icon_content_description" />
   </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout/app_version_fragment.xml b/app/src/main/res/layout/app_version_fragment.xml
index 4577da4eed2..991461a95cf 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_content_description" />
 
     <TextView
       android:id="@+id/app_last_update_date_text_view"
diff --git a/app/src/main/res/layout/bottom_left_overlay.xml b/app/src/main/res/layout/bottom_left_overlay.xml
index fd54dfb04a8..d716c007616 100644
--- a/app/src/main/res/layout/bottom_left_overlay.xml
+++ b/app/src/main/res/layout/bottom_left_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" />
 
     <com.google.android.material.card.MaterialCardView
       android:layout_width="0dp"
@@ -70,7 +71,8 @@
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_close_black_24"
-          app:tint="@color/component_color_shared_close_spotlight_button_color" />
+          app:tint="@color/component_color_shared_close_spotlight_button_color"
+          android:contentDescription="@string/close_spotlight_button_content_description" />
       </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
   </androidx.constraintlayout.widget.ConstraintLayout>
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" />
 
     <com.google.android.material.card.MaterialCardView
       android:layout_width="0dp"
@@ -71,7 +72,8 @@
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_close_black_24"
-          app:tint="@color/component_color_shared_close_spotlight_button_color" />
+          app:tint="@color/component_color_shared_close_spotlight_button_color"
+          android:contentDescription="@string/close_spotlight_button_content_description" />
       </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
   </androidx.constraintlayout.widget.ConstraintLayout>
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" />
 
     <org.oppia.android.app.customview.ContinueButtonView
       android:id="@+id/continue_interaction_button"
diff --git a/app/src/main/res/layout/continue_navigation_button_item.xml b/app/src/main/res/layout/continue_navigation_button_item.xml
index 687f2edafea..c8f5f736e5f 100644
--- a/app/src/main/res/layout/continue_navigation_button_item.xml
+++ b/app/src/main/res/layout/continue_navigation_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_state_navigation_button_content_description" />
 
     <org.oppia.android.app.customview.ContinueButtonView
       android:id="@+id/continue_navigation_button"
diff --git a/app/src/main/res/layout/drawer_fragment.xml b/app/src/main/res/layout/drawer_fragment.xml
index 0dd6b44dd8d..31558550a83 100644
--- a/app/src/main/res/layout/drawer_fragment.xml
+++ b/app/src/main/res/layout/drawer_fragment.xml
@@ -67,7 +67,8 @@
             android:layout_height="24dp"
             android:layout_gravity="center_vertical"
             app:srcCompat="@drawable/ic_baseline_code_24"
-            android:tint="@{footerViewModel.isDeveloperOptionsSelected ? @color/component_color_drawer_fragment_developer_options_selected_image_color : @color/component_color_shared_primary_dark_text_color}" />
+            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" />
 
           <TextView
             android:layout_width="match_parent"
@@ -98,7 +99,8 @@
             android:layout_height="24dp"
             android:layout_gravity="center_vertical"
             android:tint="@{footerViewModel.isAdministratorControlsSelected ? @color/component_color_drawer_fragment_admin_controls_selected_image_color : @color/component_color_shared_primary_dark_text_color}"
-            app:srcCompat="@drawable/ic_admin_settings_icon_brown_24dp" />
+            app:srcCompat="@drawable/ic_admin_settings_icon_brown_24dp"
+            android:contentDescription="@string/administrator_controls_icon_content_description" />
 
           <TextView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/exploration_activity.xml b/app/src/main/res/layout/exploration_activity.xml
index 8dd9b645d25..39d0e3356dc 100755
--- a/app/src/main/res/layout/exploration_activity.xml
+++ b/app/src/main/res/layout/exploration_activity.xml
@@ -64,7 +64,8 @@
             android:layout_gravity="end"
             android:minWidth="48dp"
             android:minHeight="48dp"
-            android:scaleType="center" />
+            android:scaleType="center"
+            android:contentDescription="@string/options_menu_content_description" />
         </LinearLayout>
       </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
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" />
 
     <ImageButton
       android:id="@+id/next_state_navigation_button"
@@ -55,6 +56,7 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="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/next_button_content_description" />
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
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" />
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
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" />
 
         <TextView
           style="@style/Subtitle1ViewCenter"
@@ -115,7 +116,8 @@
         android:paddingTop="12dp"
         android:paddingEnd="16dp"
         android:paddingBottom="12dp"
-        app:srcCompat="@drawable/ic_settings_grey_48dp" />
+        app:srcCompat="@drawable/ic_settings_grey_48dp"
+        android:contentDescription="@string/setting_icon_content_description" />
     </LinearLayout>
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/profile_picture_activity.xml b/app/src/main/res/layout/profile_picture_activity.xml
index fcdc2deb08b..d751151badf 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_view_content_description" />
 
     <View
       android:id="@+id/app_version_shadow_view"
diff --git a/app/src/main/res/layout/return_to_topic_button_item.xml b/app/src/main/res/layout/return_to_topic_button_item.xml
index c6e20c3302c..1ac496459a9 100644
--- a/app/src/main/res/layout/return_to_topic_button_item.xml
+++ b/app/src/main/res/layout/return_to_topic_button_item.xml
@@ -27,7 +27,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" />
 
     <Button
       android:id="@+id/return_to_topic_button"
diff --git a/app/src/main/res/layout/revision_card_activity.xml b/app/src/main/res/layout/revision_card_activity.xml
index c085eab2b6f..b10b98e104b 100644
--- a/app/src/main/res/layout/revision_card_activity.xml
+++ b/app/src/main/res/layout/revision_card_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
 
   <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -37,7 +37,8 @@
           android:layout_gravity="end"
           android:minWidth="48dp"
           android:minHeight="48dp"
-          android:scaleType="center" />
+          android:scaleType="center"
+          android:contentDescription="@string/options_menu_content_description" />
 
         <TextView
           android:id="@+id/revision_card_toolbar_title"
diff --git a/app/src/main/res/layout/story_chapter_view.xml b/app/src/main/res/layout/story_chapter_view.xml
index 769f7c8b94e..e606cc13c39 100644
--- a/app/src/main/res/layout/story_chapter_view.xml
+++ b/app/src/main/res/layout/story_chapter_view.xml
@@ -73,7 +73,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" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
           android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/submit_button_item.xml b/app/src/main/res/layout/submit_button_item.xml
index 9a54fb33a0e..b8788118fcb 100644
--- a/app/src/main/res/layout/submit_button_item.xml
+++ b/app/src/main/res/layout/submit_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" />
 
     <Button
       android:id="@+id/submit_answer_button"
diff --git a/app/src/main/res/layout/test_drawable_binding_adapter_activity.xml b/app/src/main/res/layout/test_drawable_binding_adapter_activity.xml
index 278f8477e76..7afe23a9dc0 100644
--- a/app/src/main/res/layout/test_drawable_binding_adapter_activity.xml
+++ b/app/src/main/res/layout/test_drawable_binding_adapter_activity.xml
@@ -7,5 +7,6 @@
   <ImageView
     android:id="@+id/view_for_drawable_binding_adapters_test"
     android:layout_width="match_parent"
-    android:layout_height="320dp" />
+    android:layout_height="320dp"
+    android:contentDescription="@string/drawable_binding_content_description" />
 </LinearLayout>
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..cba12ee680a 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 @@
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/image_view_for_data_binding"
   android:layout_width="32dp"
-  android:layout_height="32dp"/>
+  android:layout_height="32dp"
+  android:contentDescription="@string/data_binding_content_description" />
 
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..b4d3b9c778a 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 @@
   <ImageView
     android:id="@+id/test_url_parser_image_view"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content" />
+    android:layout_height="wrap_content"
+    android:contentDescription="@string/test_url_parser_content_description" />
 </FrameLayout>
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..b55a934590b 100644
--- a/app/src/main/res/layout/text_input_interaction_item.xml
+++ b/app/src/main/res/layout/text_input_interaction_item.xml
@@ -21,7 +21,6 @@
     <org.oppia.android.app.customview.interaction.TextInputInteractionView
       android:id="@+id/text_input_interaction_view"
       style="@style/InputInteractionEditText"
-      android:contentDescription="@{viewModel.hintText.length() == 0 ? @string/text_input_default_content_description : ``}"
       android:hint="@{viewModel.hintText}"
       android:inputType="text"
       android:text="@={viewModel.answerText}"
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" />
 
     <com.google.android.material.card.MaterialCardView
       android:layout_width="0dp"
@@ -67,7 +68,8 @@
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_close_black_24"
-          app:tint="@color/component_color_shared_close_spotlight_button_color" />
+          app:tint="@color/component_color_shared_close_spotlight_button_color"
+          android:contentDescription="@string/close_spotlight_button_content_description" />
       </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
   </androidx.constraintlayout.widget.ConstraintLayout>
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" />
 
     <com.google.android.material.card.MaterialCardView
       android:layout_width="0dp"
@@ -70,7 +71,8 @@
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_close_black_24"
-          app:tint="@color/component_color_shared_close_spotlight_button_color" />
+          app:tint="@color/component_color_shared_close_spotlight_button_color"
+          android:contentDescription="@string/close_spotlight_button_content_description" />
       </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
   </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/topic_info_fragment.xml b/app/src/main/res/layout/topic_info_fragment.xml
index a25f86330d4..e3d76c0ae38 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_content_description" />
 
       <TextView
         android:id="@+id/download_story_count_text_view"
diff --git a/app/src/main/res/layout/walkthrough_final_fragment.xml b/app/src/main/res/layout/walkthrough_final_fragment.xml
index bc7a49109b2..0e9eed6e439 100644
--- a/app/src/main/res/layout/walkthrough_final_fragment.xml
+++ b/app/src/main/res/layout/walkthrough_final_fragment.xml
@@ -30,7 +30,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/walkthrough_final_title_text_view"
-        app:srcCompat="@drawable/ic_portrait_onboarding_0" />
+        app:srcCompat="@drawable/ic_portrait_onboarding_0"
+        android:contentDescription="@string/walkthrough_final_content_description" />
 
       <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/walkthrough_welcome_fragment.xml b/app/src/main/res/layout/walkthrough_welcome_fragment.xml
index 50233acdcb8..68275e12a56 100644
--- a/app/src/main/res/layout/walkthrough_welcome_fragment.xml
+++ b/app/src/main/res/layout/walkthrough_welcome_fragment.xml
@@ -61,7 +61,8 @@
         app:srcCompat="@drawable/ic_portrait_onboarding_0"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/walkthrough_welcome_description_text_view" />
+        app:layout_constraintTop_toBottomOf="@+id/walkthrough_welcome_description_text_view"
+        android:contentDescription="@string/walkthrough_welcome_content_description" />
 
       <Button
         android:id="@+id/walkthrough_welcome_next_button"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 76818825418..f8bca876026 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -581,4 +581,25 @@
   <string name="nps_score_question">On a scale from 0–10, how likely are you to recommend %s to a friend or colleague?</string>
   <string name="previous_subtopic_talkback_text">The previous subtopic is %s</string>
   <string name="next_subtopic_talkback_text">The next subtopic is %s</string>
+  <string name="test_drop_down_icon_content_description">Test Dropdown Icon</string>
+
+  <string name="app_info_content_description">App Info</string>
+  <string name="spotlight_overlay_arrow_content_description">Spotlight Overlay Arrow</string>
+  <string name="close_spotlight_button_content_description">Close Spotlight Button</string>
+  <string name="previous_state_navigation_button_content_description">Previous State Navigation Button</string>
+  <string name="developer_options_icon_content_description">Developer Options Icon</string>
+  <string name="administrator_controls_icon_content_description">Administrator Controls Icon</string>
+  <string name="options_menu_content_description">Options Menu</string>
+  <string name="previous_button_content_description">Previous Button</string>
+  <string name="next_button_content_description">Next Button</string>
+  <string name="language_icon_content_description">Language Icon</string>
+  <string name="setting_icon_content_description">Setting Icon</string>
+  <string name="profile_picture_view_content_description">Profile Picture View</string>
+  <string name="lock_icon_content_description">Lock Icon</string>
+  <string name="walkthrough_welcome_content_description">Walkthrough Welcome</string>
+  <string name="walkthrough_final_content_description">Walkthrough Final</string>
+  <string name="download_status_content_description">Download Status</string>
+  <string name="test_url_parser_content_description">Test Url Parser</string>
+  <string name="drawable_binding_content_description">Drawable Binding</string>
+  <string name="data_binding_content_description">Data Binding</string>
 </resources>

From 33705025275a2274755e315e3e6e2fa6d8a737fc Mon Sep 17 00:00:00 2001
From: the_mr17 <saptakmanna100@gmail.com>
Date: Mon, 2 Oct 2023 18:01:35 +0530
Subject: [PATCH 4/6] Fixes duplicate attribute error

---
 app/src/main/res/layout/revision_card_activity.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/revision_card_activity.xml b/app/src/main/res/layout/revision_card_activity.xml
index b10b98e104b..be55a492996 100644
--- a/app/src/main/res/layout/revision_card_activity.xml
+++ b/app/src/main/res/layout/revision_card_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout>
 
   <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"

From db8e54494b36a85dbb7d3d86cf882c651abd38d7 Mon Sep 17 00:00:00 2001
From: the_mr17 <saptakmanna100@gmail.com>
Date: Thu, 5 Oct 2023 17:09:46 +0530
Subject: [PATCH 5/6] Minor fixes

---
 app/src/main/res/layout-land/topic_info_fragment.xml  |  2 +-
 .../res/layout-land/walkthrough_final_fragment.xml    |  2 +-
 .../res/layout-land/walkthrough_welcome_fragment.xml  |  2 +-
 .../res/layout-sw600dp-land/topic_info_fragment.xml   |  2 +-
 .../res/layout-sw600dp-port/topic_info_fragment.xml   |  2 +-
 .../layout/activity_view_binding_adapters_test.xml    |  2 +-
 app/src/main/res/layout/app_version_fragment.xml      |  2 +-
 app/src/main/res/layout/profile_picture_activity.xml  |  2 +-
 .../layout/test_drawable_binding_adapter_activity.xml |  2 +-
 .../test_image_view_bindable_adapter_activity.xml     |  2 +-
 app/src/main/res/layout/test_url_parser_activity.xml  |  2 +-
 .../main/res/layout/text_input_interaction_item.xml   |  7 +++++--
 app/src/main/res/layout/topic_info_fragment.xml       |  2 +-
 .../main/res/layout/walkthrough_final_fragment.xml    |  2 +-
 .../main/res/layout/walkthrough_welcome_fragment.xml  |  2 +-
 app/src/main/res/values/strings.xml                   | 11 ++---------
 16 files changed, 21 insertions(+), 25 deletions(-)

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 33beb578dfb..6ebd9c406d1 100644
--- a/app/src/main/res/layout-land/topic_info_fragment.xml
+++ b/app/src/main/res/layout-land/topic_info_fragment.xml
@@ -106,7 +106,7 @@
         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"
-        android:contentDescription="@string/download_status_content_description" />
+        android:contentDescription="@string/download_status_image_content_description" />
 
       <TextView
         android:id="@+id/download_story_count_text_view"
diff --git a/app/src/main/res/layout-land/walkthrough_final_fragment.xml b/app/src/main/res/layout-land/walkthrough_final_fragment.xml
index 88ad550522b..4cc89c8fc26 100644
--- a/app/src/main/res/layout-land/walkthrough_final_fragment.xml
+++ b/app/src/main/res/layout-land/walkthrough_final_fragment.xml
@@ -27,7 +27,7 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       app:srcCompat="@drawable/ic_portrait_onboarding_0"
-      android:contentDescription="@string/walkthrough_final_content_description" />
+      android:importantForAccessibility="no" />
 
     <LinearLayout
       android:id="@+id/walkthrough_button_container"
diff --git a/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml b/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml
index 229a9a637a4..06c4ed0447f 100644
--- a/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml
+++ b/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml
@@ -62,7 +62,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_portrait_onboarding_0"
-        android:contentDescription="@string/walkthrough_welcome_content_description" />
+        android:importantForAccessibility="no" />
 
       <Button
         android:id="@+id/walkthrough_welcome_next_button"
diff --git a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml
index 4c1e692b764..2f4129184af 100644
--- a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml
@@ -100,7 +100,7 @@
           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"
-          android:contentDescription="@string/download_status_content_description" />
+          android:contentDescription="@string/download_status_image_content_description" />
 
         <TextView
           android:id="@+id/download_story_count_text_view"
diff --git a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml
index 85ca52e645a..e683f6b64e3 100644
--- a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml
@@ -120,7 +120,7 @@
         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"
-        android:contentDescription="@string/download_status_content_description" />
+        android:contentDescription="@string/download_status_image_content_description" />
 
       <TextView
         android:id="@+id/download_story_count_text_view"
diff --git a/app/src/main/res/layout/activity_view_binding_adapters_test.xml b/app/src/main/res/layout/activity_view_binding_adapters_test.xml
index 49126117427..e6e4470802d 100644
--- a/app/src/main/res/layout/activity_view_binding_adapters_test.xml
+++ b/app/src/main/res/layout/activity_view_binding_adapters_test.xml
@@ -17,6 +17,6 @@
       android:layout_gravity="center_vertical"
       android:padding="8dp"
       app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp"
-      android:contentDescription="@string/test_drop_down_icon_content_description" />
+      android:importantForAccessibility="no" />
   </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout/app_version_fragment.xml b/app/src/main/res/layout/app_version_fragment.xml
index 991461a95cf..32ddf6d236f 100644
--- a/app/src/main/res/layout/app_version_fragment.xml
+++ b/app/src/main/res/layout/app_version_fragment.xml
@@ -41,7 +41,7 @@
       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"
-      android:contentDescription="@string/app_info_content_description" />
+      android:contentDescription="@string/app_info_icon_content_description" />
 
     <TextView
       android:id="@+id/app_last_update_date_text_view"
diff --git a/app/src/main/res/layout/profile_picture_activity.xml b/app/src/main/res/layout/profile_picture_activity.xml
index d751151badf..82932006341 100644
--- a/app/src/main/res/layout/profile_picture_activity.xml
+++ b/app/src/main/res/layout/profile_picture_activity.xml
@@ -49,7 +49,7 @@
       app:layout_constraintTop_toBottomOf="@id/profile_picture_activity_app_bar_layout"
       profile:src="@{viewModel.profileAvatar}"
       tools:src="@drawable/ic_default_avatar"
-      android:contentDescription="@string/profile_picture_view_content_description" />
+      android:contentDescription="@string/profile_picture_image_view_content_description" />
 
     <View
       android:id="@+id/app_version_shadow_view"
diff --git a/app/src/main/res/layout/test_drawable_binding_adapter_activity.xml b/app/src/main/res/layout/test_drawable_binding_adapter_activity.xml
index 7afe23a9dc0..3c855b206ea 100644
--- a/app/src/main/res/layout/test_drawable_binding_adapter_activity.xml
+++ b/app/src/main/res/layout/test_drawable_binding_adapter_activity.xml
@@ -8,5 +8,5 @@
     android:id="@+id/view_for_drawable_binding_adapters_test"
     android:layout_width="match_parent"
     android:layout_height="320dp"
-    android:contentDescription="@string/drawable_binding_content_description" />
+    android:importantForAccessibility="no" />
 </LinearLayout>
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 cba12ee680a..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
@@ -3,5 +3,5 @@
   android:id="@+id/image_view_for_data_binding"
   android:layout_width="32dp"
   android:layout_height="32dp"
-  android:contentDescription="@string/data_binding_content_description" />
+  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 b4d3b9c778a..9b0db340bf8 100644
--- a/app/src/main/res/layout/test_url_parser_activity.xml
+++ b/app/src/main/res/layout/test_url_parser_activity.xml
@@ -7,5 +7,5 @@
     android:id="@+id/test_url_parser_image_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:contentDescription="@string/test_url_parser_content_description" />
+    android:importantForAccessibility="no" />
 </FrameLayout>
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 b55a934590b..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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:tools="http://schemas.android.com/tools"
+  xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto">
 
   <data>
@@ -22,12 +23,14 @@
       android:id="@+id/text_input_interaction_view"
       style="@style/InputInteractionEditText"
       android:hint="@{viewModel.hintText}"
+      android:contentDescription="@{viewModel.hintText.length() == 0 ? @string/text_input_default_content_description : ``}"
       android:inputType="text"
       android:text="@={viewModel.answerText}"
       android:textColorHint="@color/component_color_shared_edit_text_hint_color"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      app:textChangedListener="@{viewModel.answerTextWatcher}" />
+      app:textChangedListener="@{viewModel.answerTextWatcher}"
+      tools:ignore="ContentDescription" />
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/topic_info_fragment.xml b/app/src/main/res/layout/topic_info_fragment.xml
index e3d76c0ae38..47eccc08b25 100644
--- a/app/src/main/res/layout/topic_info_fragment.xml
+++ b/app/src/main/res/layout/topic_info_fragment.xml
@@ -127,7 +127,7 @@
         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"
-        android:contentDescription="@string/download_status_content_description" />
+        android:contentDescription="@string/download_status_image_content_description" />
 
       <TextView
         android:id="@+id/download_story_count_text_view"
diff --git a/app/src/main/res/layout/walkthrough_final_fragment.xml b/app/src/main/res/layout/walkthrough_final_fragment.xml
index 0e9eed6e439..a393fc72813 100644
--- a/app/src/main/res/layout/walkthrough_final_fragment.xml
+++ b/app/src/main/res/layout/walkthrough_final_fragment.xml
@@ -31,7 +31,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/walkthrough_final_title_text_view"
         app:srcCompat="@drawable/ic_portrait_onboarding_0"
-        android:contentDescription="@string/walkthrough_final_content_description" />
+        android:importantForAccessibility="no" />
 
       <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/walkthrough_welcome_fragment.xml b/app/src/main/res/layout/walkthrough_welcome_fragment.xml
index 68275e12a56..9543ab9a2e1 100644
--- a/app/src/main/res/layout/walkthrough_welcome_fragment.xml
+++ b/app/src/main/res/layout/walkthrough_welcome_fragment.xml
@@ -62,7 +62,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/walkthrough_welcome_description_text_view"
-        android:contentDescription="@string/walkthrough_welcome_content_description" />
+        android:importantForAccessibility="no" />
 
       <Button
         android:id="@+id/walkthrough_welcome_next_button"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f8bca876026..5d193039c55 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -581,9 +581,8 @@
   <string name="nps_score_question">On a scale from 0–10, how likely are you to recommend %s to a friend or colleague?</string>
   <string name="previous_subtopic_talkback_text">The previous subtopic is %s</string>
   <string name="next_subtopic_talkback_text">The next subtopic is %s</string>
-  <string name="test_drop_down_icon_content_description">Test Dropdown Icon</string>
 
-  <string name="app_info_content_description">App Info</string>
+  <string name="app_info_icon_content_description">App Info</string>
   <string name="spotlight_overlay_arrow_content_description">Spotlight Overlay Arrow</string>
   <string name="close_spotlight_button_content_description">Close Spotlight Button</string>
   <string name="previous_state_navigation_button_content_description">Previous State Navigation Button</string>
@@ -594,12 +593,6 @@
   <string name="next_button_content_description">Next Button</string>
   <string name="language_icon_content_description">Language Icon</string>
   <string name="setting_icon_content_description">Setting Icon</string>
-  <string name="profile_picture_view_content_description">Profile Picture View</string>
+  <string name="profile_picture_image_view_content_description">Profile Picture Image View</string>
   <string name="lock_icon_content_description">Lock Icon</string>
-  <string name="walkthrough_welcome_content_description">Walkthrough Welcome</string>
-  <string name="walkthrough_final_content_description">Walkthrough Final</string>
-  <string name="download_status_content_description">Download Status</string>
-  <string name="test_url_parser_content_description">Test Url Parser</string>
-  <string name="drawable_binding_content_description">Drawable Binding</string>
-  <string name="data_binding_content_description">Data Binding</string>
 </resources>

From 247d64e451933c376161185211b6c539e8cfaa1a Mon Sep 17 00:00:00 2001
From: the_mr17 <saptakmanna100@gmail.com>
Date: Thu, 5 Oct 2023 17:29:55 +0530
Subject: [PATCH 6/6] Adds missing string

---
 app/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5d193039c55..0f02760b7ae 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -595,4 +595,5 @@
   <string name="setting_icon_content_description">Setting Icon</string>
   <string name="profile_picture_image_view_content_description">Profile Picture Image View</string>
   <string name="lock_icon_content_description">Lock Icon</string>
+  <string name="download_status_image_content_description">Download Status</string>
 </resources>