Merge branch 'develop' into localization-part10-fix-splash-screen-fre…

…eze-android-11
oppia · Oct 7, 2021 · 7238233 · 7238233
2 parents a4f46f6 + daf4716
commit 7238233
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -150,6 +150,7 @@
     <activity
       android:name=".app.splash.SplashActivity"
       android:screenOrientation="portrait"
+      android:label="@string/app_name"
       android:theme="@style/SplashScreenTheme">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt
@@ -382,6 +382,17 @@ class SplashActivityTest {
     intended(hasComponent(OnboardingActivity::class.java.name))
   }
 
+  @Test
+  fun testSplashActivity_hasCorrectActivityLabel() {
+    initializeTestApplication()
+
+    activityTestRule.launchActivity(null)
+    testCoroutineDispatchers.advanceUntilIdle()
+
+    val title = activityTestRule.activity.title
+    assertThat(title).isEqualTo(context.getString(R.string.app_name))
+  }
+
   private fun simulateAppAlreadyOnboarded() {
     // Simulate the app was already onboarded by creating an isolated onboarding flow controller and
     // saving the onboarding status on the system before the activity is opened. Note that this has

diff --git a/scripts/assets/accessibility_label_exemptions.textproto b/scripts/assets/accessibility_label_exemptions.textproto
@@ -10,7 +10,6 @@ exempted_activity: "app/src/main/java/org/oppia/android/app/mydownloads/MyDownlo
 exempted_activity: "app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity"
 exempted_activity: "app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivity"
 exempted_activity: "app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity"
-exempted_activity: "app/src/main/java/org/oppia/android/app/splash/SplashActivity"
 exempted_activity: "app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity"
 exempted_activity: "app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestActivity"
 exempted_activity: "app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivity"