diff options
author | Jeff Davidson <jpd@google.com> | 2014-11-06 13:30:34 -0800 |
---|---|---|
committer | Jeff Davidson <jpd@google.com> | 2014-11-06 13:30:34 -0800 |
commit | 99f191f5856bb266854d7b08a50523626eb70f72 (patch) | |
tree | 03ab9684876d839931b2ea0e32f11e3e161588e4 /res | |
parent | ac61828bed8219b94afe4fe2f32cae6ef70130c0 (diff) | |
download | packages_apps_Settings-99f191f5856bb266854d7b08a50523626eb70f72.zip packages_apps_Settings-99f191f5856bb266854d7b08a50523626eb70f72.tar.gz packages_apps_Settings-99f191f5856bb266854d7b08a50523626eb70f72.tar.bz2 |
Remove the Wi-Fi Assistant card.
Per the latest mocks, advanced wireless settings will be the only
location in platform settings where Wi-Fi Assistants are configured.
The card is no longer being used.
Bug: 13780935
Change-Id: Idddf971404532256165045665bd0a6b19966d2bd
Diffstat (limited to 'res')
19 files changed, 0 insertions, 116 deletions
diff --git a/res/drawable-hdpi/wifi_assistant_card.png b/res/drawable-hdpi/wifi_assistant_card.png Binary files differdeleted file mode 100644 index 5a7e6d1..0000000 --- a/res/drawable-hdpi/wifi_assistant_card.png +++ /dev/null diff --git a/res/drawable-hdpi/wifi_assistant_card_tablet.png b/res/drawable-hdpi/wifi_assistant_card_tablet.png Binary files differdeleted file mode 100644 index d309533..0000000 --- a/res/drawable-hdpi/wifi_assistant_card_tablet.png +++ /dev/null diff --git a/res/drawable-ldrtl-hdpi/wifi_assistant_card.png b/res/drawable-ldrtl-hdpi/wifi_assistant_card.png Binary files differdeleted file mode 100644 index 67a93b3..0000000 --- a/res/drawable-ldrtl-hdpi/wifi_assistant_card.png +++ /dev/null diff --git a/res/drawable-ldrtl-mdpi/wifi_assistant_card.png b/res/drawable-ldrtl-mdpi/wifi_assistant_card.png Binary files differdeleted file mode 100644 index 578454c..0000000 --- a/res/drawable-ldrtl-mdpi/wifi_assistant_card.png +++ /dev/null diff --git a/res/drawable-ldrtl-xhdpi/wifi_assistant_card.png b/res/drawable-ldrtl-xhdpi/wifi_assistant_card.png Binary files differdeleted file mode 100644 index 8840a6a..0000000 --- a/res/drawable-ldrtl-xhdpi/wifi_assistant_card.png +++ /dev/null diff --git a/res/drawable-ldrtl-xxhdpi/wifi_assistant_card.png b/res/drawable-ldrtl-xxhdpi/wifi_assistant_card.png Binary files differdeleted file mode 100644 index 1273b73..0000000 --- a/res/drawable-ldrtl-xxhdpi/wifi_assistant_card.png +++ /dev/null diff --git a/res/drawable-ldrtl-xxxhdpi/wifi_assistant_card.png b/res/drawable-ldrtl-xxxhdpi/wifi_assistant_card.png Binary files differdeleted file mode 100644 index 7c7bf0a..0000000 --- a/res/drawable-ldrtl-xxxhdpi/wifi_assistant_card.png +++ /dev/null diff --git a/res/drawable-mdpi/wifi_assistant_card.png b/res/drawable-mdpi/wifi_assistant_card.png Binary files differdeleted file mode 100644 index bb2114c..0000000 --- a/res/drawable-mdpi/wifi_assistant_card.png +++ /dev/null diff --git a/res/drawable-mdpi/wifi_assistant_card_tablet.png b/res/drawable-mdpi/wifi_assistant_card_tablet.png Binary files differdeleted file mode 100644 index 0ca411c..0000000 --- a/res/drawable-mdpi/wifi_assistant_card_tablet.png +++ /dev/null diff --git a/res/drawable-xhdpi/wifi_assistant_card.png b/res/drawable-xhdpi/wifi_assistant_card.png Binary files differdeleted file mode 100644 index 1f8a5b9..0000000 --- a/res/drawable-xhdpi/wifi_assistant_card.png +++ /dev/null diff --git a/res/drawable-xhdpi/wifi_assistant_card_tablet.png b/res/drawable-xhdpi/wifi_assistant_card_tablet.png Binary files differdeleted file mode 100644 index 570a663..0000000 --- a/res/drawable-xhdpi/wifi_assistant_card_tablet.png +++ /dev/null diff --git a/res/drawable-xxhdpi/wifi_assistant_card.png b/res/drawable-xxhdpi/wifi_assistant_card.png Binary files differdeleted file mode 100644 index 65211cd..0000000 --- a/res/drawable-xxhdpi/wifi_assistant_card.png +++ /dev/null diff --git a/res/drawable-xxhdpi/wifi_assistant_card_tablet.png b/res/drawable-xxhdpi/wifi_assistant_card_tablet.png Binary files differdeleted file mode 100644 index 2941b14..0000000 --- a/res/drawable-xxhdpi/wifi_assistant_card_tablet.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/wifi_assistant_card.png b/res/drawable-xxxhdpi/wifi_assistant_card.png Binary files differdeleted file mode 100644 index e79330b..0000000 --- a/res/drawable-xxxhdpi/wifi_assistant_card.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/wifi_assistant_card_tablet.png b/res/drawable-xxxhdpi/wifi_assistant_card_tablet.png Binary files differdeleted file mode 100644 index 54120fb..0000000 --- a/res/drawable-xxxhdpi/wifi_assistant_card_tablet.png +++ /dev/null diff --git a/res/layout/wifi_assistant_card.xml b/res/layout/wifi_assistant_card.xml deleted file mode 100644 index b7ab7b9..0000000 --- a/res/layout/wifi_assistant_card.xml +++ /dev/null @@ -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> diff --git a/res/values/colors.xml b/res/values/colors.xml index 6ccced2..961fb2f 100644 --- a/res/values/colors.xml +++ b/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> diff --git a/res/values/strings.xml b/res/values/strings.xml index fbf37ab..a7cdad2 100644 --- a/res/values/strings.xml +++ b/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> diff --git a/res/values/styles.xml b/res/values/styles.xml index cd6883f..0e83d90 100644 --- a/res/values/styles.xml +++ b/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> |