From 179a86ce64f037d92254ed3babfb9724835f7c0b Mon Sep 17 00:00:00 2001
From: ekager <ekager@mozilla.com>
Date: Fri, 21 Aug 2020 17:43:35 -0400
Subject: [PATCH] Puts login selection behind a nightly feature flag

---
 app/src/main/java/org/mozilla/fenix/FeatureFlags.kt          | 5 +++++
 .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 074591d9e..f1d18c3af 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -50,4 +50,9 @@ object FeatureFlags {
      * Enables viewing downloads in browser.
      */
     val viewDownloads = Config.channel.isNightlyOrDebug
+
+    /**
+     * Enables selecting from multiple logins.
+     */
+    val loginSelect = Config.channel.isNightlyOrDebug
 }
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 5b3cde82d..58d4bb422 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -488,7 +488,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
                     onNeedToRequestPermissions = { permissions ->
                         requestPermissions(permissions, REQUEST_CODE_PROMPT_PERMISSIONS)
                     },
-                    loginPickerView = loginSelectBar,
+                    loginPickerView = if (FeatureFlags.loginSelect) loginSelectBar else null,
                     onManageLogins = {
                         browserAnimator.captureEngineViewAndDrawStatically {
                             val directions =