This project is archived. Its data is read-only.

Commit 8bdabf1e authored May 05, 2020 by MozLando

Merge #6860



6860: For #6859 - Fix Clear button not showing when entering Search fragment r=rocketsroger a=codrut-topliceanu



Co-authored-by: codrut.topliceanu <codrut.topliceanu@softvision.ro>

parents 5bf5c424 ddb9c736

components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/edit/EditToolbar.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -226,6 +226,7 @@ class EditToolbar internal constructor(

		internal fun updateUrl(url: String, shouldAutoComplete: Boolean = false) {
		views.url.setText(url, shouldAutoComplete)
		views.clear.isVisible = url.isNotBlank()
		}

		/**

components/browser/toolbar/src/test/java/mozilla/components/browser/toolbar/edit/EditToolbarTest.kt

+9 −0

Original line number	Diff line number	Diff line
		@@ -172,6 +172,15 @@ class EditToolbarTest {
		assertTrue(clearView.visibility == View.GONE)
		}

		@Test
		fun `clearView visible on updateUrl`() {
		val (_, editToolbar) = createEditToolbar()
		val clearView = editToolbar.views.clear

		editToolbar.updateUrl("TestUrl", false)
		assertTrue(clearView.visibility == View.VISIBLE)
		}

		@Test
		fun `clearView clears text in urlView`() {
		val (_, editToolbar) = createEditToolbar()