am 0fc9271b: am c4a68608: am 99f191f5: Remove the Wi-Fi Assistant card.

* commit '0fc9271b21b46b6972dcf0e976d20605042b0b38':
  Remove the Wi-Fi Assistant card.

res/layout/wifi_assistant_card.xml

@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/wifi_assistant_card"
-    android:background="@android:color/transparent"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="vertical">
-
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="@dimen/wifi_assistant_height">
-
-        <ImageView
-            android:id="@+id/cardBackground"
-            android:background="@color/wifi_assistant_color_accent"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:src="@drawable/wifi_assistant_card" />
-
-        <TextView
-            android:id="@+id/backgroundText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/wifi_assistant_text_padding"
-            android:gravity="start"
-            android:paddingStart="@dimen/wifi_assistant_padding_start_end"
-            android:paddingTop="@dimen/wifi_assistant_padding_top_bottom"
-            android:text="@string/wifi_assistant_intro_setup"
-            style="@style/WifiAssistantText" />
-
-    </RelativeLayout>
-
-    <TextView
-        android:id="@+id/wifi_assistant_text"
-        android:background="@android:color/transparent"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginBottom="@dimen/wifi_assistant_padding_top_bottom"
-        android:layout_marginTop="@dimen/wifi_assistant_padding_top_bottom"
-        android:layout_marginLeft="@dimen/wifi_assistant_padding_start_end"
-        android:layout_marginRight="@dimen/wifi_assistant_padding_start_end"
-        android:gravity="start"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:background="@android:color/transparent"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:gravity="end"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/no_thanks_button"
-            android:text="@string/wifi_assistant_no_thanks"
-            style="@style/WifiAssistantButton.Negative" />
-
-        <Button
-            android:id="@+id/setup"
-            android:text="@string/wifi_assistant_setup"
-            style="@style/WifiAssistantButton.Positive" />
-
-    </LinearLayout>
-
-</LinearLayout>

res/values/colors.xml

@@ -45,8 +45,6 @@
     <color name="setup_wizard_wifi_color_dark">#ff00e4ff</color>
     <color name="setup_wizard_wifi_color_light">#ff0096a6</color>
 
-    <color name="wifi_assistant_color_accent">#ff009587</color>
-
     <color name="circle_avatar_frame_color">#ffffffff</color>
     <color name="circle_avatar_frame_shadow_color">#80000000</color>
     <color name="circle_avatar_frame_pressed_color">#ffffffff</color>

res/values/strings.xml

@@ -1328,20 +1328,8 @@
     <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
     <string name="bluetooth_dock_settings_remember">Remember settings</string>
 
-    <!-- Wifi Assistant title string.  [CHAR LIMIT=40] -->
-    <string name="wifi_assistant_intro_setup">Introducing\nWi\u2011Fi Assistant</string>
-    <!-- Wifi Assistant No, thanks string.  Text to say no to wifi assistant. [CHAR LIMIT=20] -->
-    <string name="wifi_assistant_no_thanks">NO, THANKS</string>
-    <!-- Wifi Assistant setup string.  Text to say yes to wifi assistant and begin setup. [CHAR LIMIT=20] -->
-    <string name="wifi_assistant_setup">SET UP</string>
-    <!-- Wifi Assistant card message.  [CHAR LIMIT=200] -->
-    <string name="wifi_assistant_card_message">Automatically connect to available networks with a Wi\u2011Fi Assistant.</string>
     <!-- Wifi Assistant title.  [CHAR LIMIT=40] -->
     <string name="wifi_assistant_title">Wi\u2011Fi Assistant</string>
-    <!-- Wifi Assistant title message.  First piece of text on the Wifi Assistant setup wizard.  [CHAR LIMIT=200] -->
-    <string name="wifi_assistant_title_message"><xliff:g id="wifi_assistant">%1$s</xliff:g> automatically connects you to the best available Wi\u2011Fi</string>
-    <!-- Wifi Assistant open app button text.  [CHAR LIMIT=40] -->
-    <string name="wifi_assistant_open_app">OPEN APP</string>
 
     <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
     <string name="wifi_display_settings_title">Cast screen</string>

res/values/styles.xml

@@ -305,27 +305,6 @@
         <item name="android:textSize">18sp</item>
     </style>
 
-    <style name="WifiAssistantText">
-        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
-        <item name="android:textColor">@android:color/white</item>
-    </style>
-
-    <style name="WifiAssistantButton">
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:background">@android:color/white</item>
-        <item name="android:paddingStart">@dimen/wifi_assistant_text_padding</item>
-        <item name="android:paddingEnd">@dimen/wifi_assistant_text_padding</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
-    </style>
-
-    <style name="WifiAssistantButton.Negative">
-    </style>
-
-    <style name="WifiAssistantButton.Positive">
-        <item name="android:textColor">@color/wifi_assistant_color_accent</item>
-    </style>
-
     <!-- Scrollbar style OUTSIDE_OVERLAY -->
     <integer name="preference_scrollbar_style">33554432</integer>