Fix #4790 Talkback will read toolbar title clickable

app/src/main/java/org/oppia/android/app/help/thirdparty/LicenseTextViewerActivityPresenter.kt

@@ -2,16 +2,18 @@ package org.oppia.android.app.help.thirdparty
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
+import javax.inject.Inject
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.databinding.LicenseTextViewerActivityBinding
-import javax.inject.Inject
+import org.oppia.android.util.accessibility.AccessibilityService
 
 /** The presenter for [LicenseTextViewerActivity]. */
 @ActivityScope
 class LicenseTextViewerActivityPresenter @Inject constructor(
   private val activity: AppCompatActivity,
+  private val accessibilityService: AccessibilityService,
   private val resourceHandler: AppLanguageResourceHandler
 ) {
 
@@ -44,8 +46,12 @@ class LicenseTextViewerActivityPresenter @Inject constructor(
       (activity as LicenseTextViewerActivity).finish()
     }
 
-    binding.licenseTextViewerActivityToolbarTitle.setOnClickListener {
-      binding.licenseTextViewerActivityToolbarTitle.isSelected = true
+    activity.applicationContext?.let {
+      if (!accessibilityService.isScreenReaderEnabled()) {
+        binding.licenseTextViewerActivityToolbarTitle.setOnClickListener {
+          binding.licenseTextViewerActivityToolbarTitle.isSelected = true
+        }
+      }
     }
 
     if (getLicenseTextViewerFragment() == null) {

app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt

@@ -10,6 +10,7 @@ import androidx.core.view.doOnPreDraw
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
+import javax.inject.Inject
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
 import org.oppia.android.app.help.HelpActivity
@@ -36,7 +37,7 @@ import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
-import javax.inject.Inject
+import org.oppia.android.util.accessibility.AccessibilityService
 
 private const val TAG_UNSAVED_EXPLORATION_DIALOG = "UNSAVED_EXPLORATION_DIALOG"
 private const val TAG_STOP_EXPLORATION_DIALOG = "STOP_EXPLORATION_DIALOG"
@@ -53,6 +54,7 @@ class ExplorationActivityPresenter @Inject constructor(
   private val viewModelProvider: ViewModelProvider<ExplorationViewModel>,
   private val fontScaleConfigurationUtil: FontScaleConfigurationUtil,
   private val translationController: TranslationController,
+  private val accessibilityService: AccessibilityService,
   private val oppiaLogger: OppiaLogger,
   private val resourceHandler: AppLanguageResourceHandler
 ) {
@@ -97,8 +99,12 @@ class ExplorationActivityPresenter @Inject constructor(
     explorationToolbarTitle = binding.explorationToolbarTitle
     activity.setSupportActionBar(explorationToolbar)
 
-    binding.explorationToolbarTitle.setOnClickListener {
-      binding.explorationToolbarTitle.isSelected = true
+    activity.applicationContext?.let {
+      if (!accessibilityService.isScreenReaderEnabled()) {
+        binding.explorationToolbarTitle.setOnClickListener {
+          binding.explorationToolbarTitle.isSelected = true
+        }
+      }
     }
 
     binding.explorationToolbar.setNavigationOnClickListener {

app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt

@@ -18,6 +18,7 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearSmoothScroller
 import androidx.recyclerview.widget.RecyclerView
+import javax.inject.Inject
 import org.oppia.android.R
 import org.oppia.android.app.home.RouteToExplorationListener
 import org.oppia.android.app.model.ChapterPlayState
@@ -42,7 +43,6 @@ import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import org.oppia.android.util.gcsresource.DefaultResourceBucketName
 import org.oppia.android.util.parser.html.HtmlParser
 import org.oppia.android.util.parser.html.TopicHtmlParserEntityType
-import javax.inject.Inject
 
 /** The presenter for [StoryFragment]. */
 class StoryFragmentPresenter @Inject constructor(
@@ -90,8 +90,12 @@ class StoryFragmentPresenter @Inject constructor(
       (activity as StoryActivity).finish()
     }
 
-    binding.storyToolbarTitle.setOnClickListener {
-      binding.storyToolbarTitle.isSelected = true
+    activity.applicationContext?.let {
+      if (!accessibilityService.isScreenReaderEnabled()) {
+        binding.storyToolbarTitle.setOnClickListener {
+          binding.storyToolbarTitle.isSelected = true
+        }
+      }
     }
 
     linearLayoutManager = LinearLayoutManager(activity.applicationContext)

app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt

@@ -9,6 +9,7 @@ import androidx.fragment.app.Fragment
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
+import javax.inject.Inject
 import org.oppia.android.R
 import org.oppia.android.app.fragment.FragmentScope
 import org.oppia.android.app.model.ProfileId
@@ -22,7 +23,7 @@ import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
 import org.oppia.android.util.platformparameter.EnableExtraTopicTabsUi
 import org.oppia.android.util.platformparameter.PlatformParameterValue
-import javax.inject.Inject
+import org.oppia.android.util.accessibility.AccessibilityService
 
 /** The presenter for [TopicFragment]. */
 @FragmentScope
@@ -31,6 +32,7 @@ class TopicFragmentPresenter @Inject constructor(
   private val fragment: Fragment,
   private val viewModel: TopicViewModel,
   private val oppiaLogger: OppiaLogger,
+  private val accessibilityService: AccessibilityService,
   private val analyticsController: AnalyticsController,
   @EnableExtraTopicTabsUi private val enableExtraTopicTabsUi: PlatformParameterValue<Boolean>,
   private val resourceHandler: AppLanguageResourceHandler
@@ -61,12 +63,17 @@ class TopicFragmentPresenter @Inject constructor(
     this.internalProfileId = internalProfileId
     this.topicId = topicId
 
-    binding.topicToolbar.setNavigationOnClickListener {
+    binding.topicToolbar.getChildAt(0).setOnClickListener {
       (activity as TopicActivity).finish()
     }
 
-    binding.topicToolbar.setOnClickListener {
-      binding.topicToolbarTitle.isSelected = true
+    activity.applicationContext?.let {
+
+      if (!accessibilityService.isScreenReaderEnabled()) {
+        binding.topicToolbar.setOnClickListener {
+          binding.topicToolbarTitle.isSelected = true
+        }
+      }
     }
 
     viewModel.setInternalProfileId(internalProfileId)

app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityPresenter.kt

@@ -7,6 +7,7 @@ import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.Transformations
+import javax.inject.Inject
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
 import org.oppia.android.app.help.HelpActivity
@@ -21,7 +22,7 @@ import org.oppia.android.domain.topic.TopicController
 import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
-import javax.inject.Inject
+import org.oppia.android.util.accessibility.AccessibilityService
 
 /** The presenter for [RevisionCardActivity]. */
 @ActivityScope
@@ -30,6 +31,7 @@ class RevisionCardActivityPresenter @Inject constructor(
   private val oppiaLogger: OppiaLogger,
   private val analyticsController: AnalyticsController,
   private val topicController: TopicController,
+  private val accessibilityService: AccessibilityService,
   private val translationController: TranslationController
 ) {
 
@@ -66,9 +68,14 @@ class RevisionCardActivityPresenter @Inject constructor(
     binding.revisionCardToolbar.setNavigationOnClickListener {
       (activity as ReturnToTopicClickListener).onReturnToTopicRequested()
     }
-    binding.revisionCardToolbarTitle.setOnClickListener {
-      binding.revisionCardToolbarTitle.isSelected = true
+    activity.applicationContext?.let {
+      if (!accessibilityService.isScreenReaderEnabled()) {
+        binding.revisionCardToolbarTitle.setOnClickListener {
+          binding.revisionCardToolbarTitle.isSelected = true
+        }
+      }
     }
+
     subscribeToSubtopicTitle()
 
     binding.actionBottomSheetOptionsMenu.setOnClickListener {

app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt

@@ -26,6 +26,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
 import com.google.common.truth.Truth.assertThat
 import dagger.Component
+import javax.inject.Inject
+import javax.inject.Singleton
 import org.hamcrest.CoreMatchers.containsString
 import org.hamcrest.Matchers.allOf
 import org.junit.After
@@ -105,6 +107,7 @@ import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClock
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.accessibility.AccessibilityTestModule
+import org.oppia.android.util.accessibility.FakeAccessibilityService
 import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.caching.testing.CachingTestModule
 import org.oppia.android.util.gcsresource.GcsResourceModule
@@ -122,8 +125,6 @@ import org.oppia.android.util.platformparameter.EnableExtraTopicTabsUi
 import org.oppia.android.util.platformparameter.PlatformParameterValue
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
-import javax.inject.Inject
-import javax.inject.Singleton
 
 private const val INFO_TAB_POSITION = 0
 private const val LESSON_TAB_POSITION = 1
@@ -156,6 +157,9 @@ class TopicFragmentTest {
   @Inject lateinit var storyProgressTestHelper: StoryProgressTestHelper
   @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
 
+  @Inject
+  lateinit var fakeAccessibilityManager: FakeAccessibilityService
+
   @field:[Inject EnableExtraTopicTabsUi]
   lateinit var enableExtraTopicTabsUi: PlatformParameterValue<Boolean>
 
@@ -315,7 +319,7 @@ class TopicFragmentTest {
   }
 
   @Test
-  fun testTopicFragment_toolbarTitle_marqueeInRtl_isDisplayedCorrectly() {
+  fun testTopicFragment_toolbarTitle_marqueeInRtl_isDisplayedCorrectly_whenReaderOff() {
     initializeApplicationComponent(false)
     activityTestRule.launchActivity(
       createTopicActivityIntent(
@@ -324,18 +328,58 @@ class TopicFragmentTest {
       )
     )
     testCoroutineDispatchers.runCurrent()
+    // setup accessibility manager
+    fakeAccessibilityManager.setScreenReaderEnabled(false)
+    val topicToolbarTitle: TextView =
+      activityTestRule.activity.findViewById(R.id.topic_toolbar_title)
+    ViewCompat.setLayoutDirection(topicToolbarTitle, ViewCompat.LAYOUT_DIRECTION_RTL)
+    onView(withId(R.id.topic_toolbar_title)).perform(click())
+    assertThat(topicToolbarTitle.ellipsize).isEqualTo(TextUtils.TruncateAt.MARQUEE)
+    assertThat(topicToolbarTitle.textAlignment).isEqualTo(View.TEXT_ALIGNMENT_VIEW_START)
+  }
+  @Test
+  fun testTopicFragment_toolbarTitle_marqueeInRtl_isDisplayedCorrectly_whenReaderOn() {
+    initializeApplicationComponent(false)
+    fakeAccessibilityManager.setScreenReaderEnabled(true)
+    activityTestRule.launchActivity(
+      createTopicActivityIntent(
+        internalProfileId,
+        FRACTIONS_TOPIC_ID
+      )
+    )
+    testCoroutineDispatchers.runCurrent()
     val topicToolbarTitle: TextView =
       activityTestRule.activity.findViewById(R.id.topic_toolbar_title)
     ViewCompat.setLayoutDirection(topicToolbarTitle, ViewCompat.LAYOUT_DIRECTION_RTL)
 
+    onView(withId(R.id.topic_toolbar_title)).perform(click())
+    assertThat(topicToolbarTitle.isFocused).isEqualTo(false)
+    assertThat(topicToolbarTitle.textAlignment).isEqualTo(View.TEXT_ALIGNMENT_VIEW_START)
+  }
+
+  @Test
+  fun testTopicFragment_toolbarTitle_marqueeInLtr_isDisplayedCorrectly_whenReaderOff() {
+    initializeApplicationComponent(false)
+    fakeAccessibilityManager.setScreenReaderEnabled(false)
+    activityTestRule.launchActivity(
+      createTopicActivityIntent(
+        internalProfileId,
+        FRACTIONS_TOPIC_ID
+      )
+    )
+    testCoroutineDispatchers.runCurrent()
+    val topicToolbarTitle: TextView =
+      activityTestRule.activity.findViewById(R.id.topic_toolbar_title)
+    ViewCompat.setLayoutDirection(topicToolbarTitle, ViewCompat.LAYOUT_DIRECTION_LTR)
     onView(withId(R.id.topic_toolbar_title)).perform(click())
     assertThat(topicToolbarTitle.ellipsize).isEqualTo(TextUtils.TruncateAt.MARQUEE)
     assertThat(topicToolbarTitle.textAlignment).isEqualTo(View.TEXT_ALIGNMENT_VIEW_START)
   }
 
   @Test
-  fun testTopicFragment_toolbarTitle_marqueeInLtr_isDisplayedCorrectly() {
+  fun testTopicFragment_toolbarTitle_marqueeInLtr_isDisplayedCorrectly_whenReaderOn() {
     initializeApplicationComponent(false)
+    fakeAccessibilityManager.setScreenReaderEnabled(true)
     activityTestRule.launchActivity(
       createTopicActivityIntent(
         internalProfileId,