From 2d4d9a9067a2904ed75247f83b0f37a086a020b2 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 17 Jul 2014 18:36:56 -0700
Subject: [PATCH] [WifiSetup] Don't show WiFi assistant card in
 WifiPickerActivity

Do not create the assistant card if we are in WifiPickerActivity,
which includes setup wizard and account login.

Bug: 16382431
Change-Id: Id5eaa8040eafe5222e1a5c9276a2a10bedebfd71
---
 src/com/android/settings/wifi/WifiSettings.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index e199d3a20ae..292a55c0dbe 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -733,6 +733,10 @@ public class WifiSettings extends RestrictedSettingsFragment
             mWifiAssistantPreference = new WifiAssistantPreference();
         }
 
+        if (getActivity() instanceof WifiPickerActivity) {
+            return false;
+        }
+
         if (NetworkScorerAppManager.getActiveScorer(getActivity()) != null) {
             // A scorer is already enabled; don't show the card.
             return false;