From f02603be37912fb40202fd9c50077639b58de2e9 Mon Sep 17 00:00:00 2001 From: Sawyer Blatz Date: Fri, 20 Sep 2019 15:29:16 -0700 Subject: [PATCH] For #5460: Fixes styling of fill link from clipboard (#5464) --- .../java/org/mozilla/fenix/search/SearchFragment.kt | 6 ++++-- app/src/main/res/layout/fragment_search.xml | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt index 224af4dc48..84c6fb9239 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt @@ -280,10 +280,12 @@ class SearchFragment : Fragment(), BackHandler { } private fun updateClipboardSuggestion(searchState: SearchFragmentState, clipboardUrl: String?) { - fill_link_from_clipboard.visibility = + val shouldBeVisible = if (searchState.showClipboardSuggestions && searchState.query.isEmpty() && !clipboardUrl.isNullOrEmpty()) - View.VISIBLE else View.GONE + View.VISIBLE else View.GONE + fill_link_from_clipboard.visibility = shouldBeVisible + divider_line.visibility = shouldBeVisible clipboard_url.text = clipboardUrl } diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index e4795b071c..65eb57c81d 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -47,6 +47,7 @@ android:id="@+id/fill_link_from_clipboard" android:layout_width="match_parent" android:layout_height="56dp" + android:layout_marginTop="8dp" android:focusable="true" android:clickable="true" android:background="?selectableItemBackground" @@ -99,10 +100,21 @@ app:layout_constraintVertical_chainStyle="packed"/> + +