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 095aaee1f..ab63ff369 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt @@ -26,6 +26,7 @@ import mozilla.components.browser.search.SearchEngine import mozilla.components.feature.qr.QrFeature import mozilla.components.support.base.feature.BackHandler import mozilla.components.support.base.feature.ViewBoundFeatureWrapper +import mozilla.components.support.ktx.android.content.hasCamera import mozilla.components.support.ktx.android.content.isPermissionGranted import mozilla.components.support.ktx.kotlin.isUrl import org.mozilla.fenix.BrowserDirection @@ -116,6 +117,7 @@ class SearchFragment : Fragment(), BackHandler { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + search_scan_button.visibility = if (context?.hasCamera() == true) View.VISIBLE else View.GONE layoutComponents(view.search_layout) qrFeature.set( diff --git a/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt index 4ef1fabde..ced7d35ee 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt @@ -13,6 +13,7 @@ import androidx.preference.PreferenceFragmentCompat import mozilla.components.concept.sync.AccountObserver import mozilla.components.concept.sync.OAuthAccount import mozilla.components.concept.sync.Profile +import mozilla.components.support.ktx.android.content.hasCamera import org.mozilla.fenix.R import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.components.metrics.Event @@ -55,6 +56,7 @@ class TurnOnSyncFragment : PreferenceFragmentCompat(), AccountObserver { preferenceSignIn?.onPreferenceClickListener = getClickListenerForSignIn() preferenceNewAccount?.onPreferenceClickListener = getClickListenerForCreateAccount() preferencePairSignIn?.onPreferenceClickListener = getClickListenerForPairing() + preferencePairSignIn?.isVisible = context?.hasCamera() ?: true } private fun getClickListenerForSignIn(): Preference.OnPreferenceClickListener {