diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt index c9e57e200..1db2d17a9 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt @@ -329,7 +329,7 @@ private fun assertStartBrowsingButton() = // Private mode elements private fun assertPrivateSessionHeader() = - onView(CoreMatchers.allOf(ViewMatchers.withText("Private session"))) + onView(CoreMatchers.allOf(ViewMatchers.withText("Private tabs"))) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) const val PRIVATE_SESSION_MESSAGE = "Firefox Preview clears your search and browsing history " + diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt index 607bd67bf..448f11e1c 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt @@ -74,7 +74,7 @@ class LibrarySubMenusMultipleSelectionToolbarRobot { fun clickOpenPrivateTab(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition { openInPrivateTabButton().click() mDevice.waitNotNull( - Until.findObject(By.text("Private session")), + Until.findObject(By.text("Private tabs")), waitingTime ) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabHeaderViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabHeaderViewHolder.kt index 354af7f1c..ce019a4aa 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabHeaderViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabHeaderViewHolder.kt @@ -80,7 +80,7 @@ class TabHeaderViewHolder( tabsMenu.isPrivate = isPrivate val headerTextResourceId = - if (isPrivate) R.string.tabs_header_private_title else R.string.tab_header_label + if (isPrivate) R.string.tabs_header_private_tabs_title else R.string.tab_header_label view.header_text.text = view.context.getString(headerTextResourceId) view.share_tabs_button.isInvisible = !isPrivate || !hasTabs view.close_tabs_button.isInvisible = !isPrivate || !hasTabs diff --git a/app/src/main/res/layout/private_browsing_description.xml b/app/src/main/res/layout/private_browsing_description.xml index b4d64fbc9..c20b5f009 100644 --- a/app/src/main/res/layout/private_browsing_description.xml +++ b/app/src/main/res/layout/private_browsing_description.xml @@ -7,7 +7,7 @@ android:id="@+id/private_session_description_wrapper" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="12dp" + android:layout_margin="0.5dp" android:importantForAccessibility="no" android:orientation="vertical"> #66FBFBFE #F520123A #F515141A - @color/accent_bright_private_theme + @color/accent_light_theme @color/accent_high_contrast_private_theme #7529A7 #492E85 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3baf1aa37..783e63304 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -372,6 +372,8 @@ Open tabs Private session + + Private tabs Add tab