diff --git a/app/src/org/commcare/activities/connect/ConnectActivity.java b/app/src/org/commcare/activities/connect/ConnectActivity.java index c5584ce602..1b5781c13a 100644 --- a/app/src/org/commcare/activities/connect/ConnectActivity.java +++ b/app/src/org/commcare/activities/connect/ConnectActivity.java @@ -111,6 +111,12 @@ public void onPostCreate(@Nullable Bundle savedInstanceState) { getSupportActionBar().setTitle(getString(R.string.connect_title)); } + @Override + public void setTitle(CharSequence title) { + super.setTitle(title); + setActionBarTitle(title); + } + @Override protected void onResume() { super.onResume(); diff --git a/app/unit-tests/src/org/commcare/fragments/connect/ConnectDeliveryHomeFragmentTest.kt b/app/unit-tests/src/org/commcare/fragments/connect/ConnectDeliveryHomeFragmentTest.kt index 84af04e9e8..139ecf673e 100644 --- a/app/unit-tests/src/org/commcare/fragments/connect/ConnectDeliveryHomeFragmentTest.kt +++ b/app/unit-tests/src/org/commcare/fragments/connect/ConnectDeliveryHomeFragmentTest.kt @@ -42,6 +42,7 @@ import org.commcare.views.connect.ConnectCtaBar import org.junit.After import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Rule @@ -213,6 +214,19 @@ class ConnectDeliveryHomeFragmentTest { ) } + @Test + fun `a later screen's title replaces the delivery title and subtitle`() { + every { job.title } returns "Delivery Opportunity" + val activity = launchHome().requireActivity() as ConnectActivity + val actionBar = activity.supportActionBar!! + assertEquals("Delivery Opportunity", actionBar.title) + + activity.setTitle(R.string.connect_learn_title) + + assertEquals(app.getString(R.string.connect_learn_title), actionBar.title) + assertNull(actionBar.subtitle) + } + private fun launchHome(): ConnectDeliveryHomeFragment { val intent = Intent(app, ConnectActivity::class.java).apply {