Merge "Remove dead strings and code" (e866733a) · Commits · e / os / android_packages_apps_Settings

res/layout/wifi_config_preference.xml

deleted100644 → 0

+0 −346

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2010 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.
		-->
		<!-- All ids in this layout must be in wifi_dialog.xml -->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent">

		<LinearLayout android:id="@+id/info"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical" />

		<LinearLayout android:id="@+id/setup_fields"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_network_setup" />

		<Spinner android:id="@+id/network_setup"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:prompt="@string/wifi_network_setup"
		android:entries="@array/wifi_network_setup" />

		</LinearLayout>

		<LinearLayout android:id="@+id/wps_fields"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_wps_pin" />

		<EditText android:id="@+id/wps_pin"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:inputType="textPassword" />

		</LinearLayout>



		<LinearLayout android:id="@+id/type"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">

		<TextView android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_ssid" />

		<EditText android:id="@+id/ssid"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:inputType="textNoSuggestions" />

		<TextView android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_security" />

		<Spinner android:id="@+id/security"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:prompt="@string/wifi_security"
		android:entries="@array/wifi_security" />
		</LinearLayout> <!-- android:id="@+id/type" -->

		<LinearLayout android:id="@+id/security_fields"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">

		<LinearLayout android:id="@+id/eap"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_eap_method" />

		<Spinner android:id="@+id/method"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:prompt="@string/wifi_eap_method"
		android:entries="@array/wifi_eap_method" />

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/please_select_phase2" />

		<Spinner android:id="@+id/phase2"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:prompt="@string/please_select_phase2"
		android:entries="@array/wifi_phase2_entries" />

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_eap_ca_cert" />

		<Spinner android:id="@+id/ca_cert"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:prompt="@string/wifi_eap_ca_cert" />

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_eap_user_cert" />

		<Spinner android:id="@+id/user_cert"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:prompt="@string/wifi_eap_user_cert" />

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_eap_identity" />

		<EditText android:id="@+id/identity"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:inputType="textNoSuggestions" />

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_eap_anonymous" />

		<EditText android:id="@+id/anonymous"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:inputType="textNoSuggestions" />
		</LinearLayout> <!-- android:id="@+id/eap" -->

		<TextView android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_password" />

		<EditText android:id="@+id/password"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:password="true" />

		<CheckBox android:id="@+id/show_password"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_show_password" />
		</LinearLayout> <!-- android:id="@+id/security_fields" -->

		<LinearLayout android:id="@+id/proxy_settings_fields"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">

		<TextView android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/proxy_settings_title" />

		<Spinner android:id="@+id/proxy_settings"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:prompt="@string/proxy_settings_title"
		android:entries="@array/wifi_proxy_settings" />
		</LinearLayout>

		<LinearLayout android:id="@+id/proxy_warning_limited_support"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">

		<!-- Dummy to enable right-justification of warning -->
		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content" />

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/proxy_warning_limited_support" />
		</LinearLayout>

		<LinearLayout android:id="@+id/proxy_fields"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">

		<TextView android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/proxy_hostname_label" />

		<EditText android:id="@+id/proxy_hostname"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:inputType="textNoSuggestions"
		android:hint="@string/proxy_hostname_hint" />

		<TextView android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/proxy_port_label" />

		<EditText android:id="@+id/proxy_port"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:inputType="number"
		android:hint="@string/proxy_port_hint" />

		<TextView android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/proxy_exclusionlist_label" />

		<EditText android:id="@+id/proxy_exclusionlist"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:inputType="textNoSuggestions"
		android:hint="@string/proxy_exclusionlist_hint" />

		</LinearLayout>

		<LinearLayout android:id="@+id/ip_fields"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_ip_settings" />

		<Spinner android:id="@+id/ip_settings"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:prompt="@string/wifi_ip_settings"
		android:entries="@array/wifi_ip_settings" />
		</LinearLayout>

		<LinearLayout android:id="@+id/staticip"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">
		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_ip_address" />

		<EditText android:id="@+id/ipaddress"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:hint="wifi_ip_address_hint"
		android:inputType="textNoSuggestions" />

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_gateway" />

		<EditText android:id="@+id/gateway"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:hint="wifi_gateway_hint"
		android:inputType="textNoSuggestions" />

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_network_prefix_length" />

		<EditText android:id="@+id/network_prefix_length"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:hint="wifi_network_prefix_length_hint"
		android:inputType="number" />

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_dns1" />

		<EditText android:id="@+id/dns1"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:hint="wifi_dns1_hint"
		android:inputType="textNoSuggestions" />

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_dns2" />

		<EditText android:id="@+id/dns2"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:hint="wifi_dns2_hint"
		android:inputType="textNoSuggestions" />
		</LinearLayout>

		</LinearLayout>

res/layout/wifi_config_ui_for_setup_wizard.xml

+0 −62

Original line number	Diff line number	Diff line
		@@ -52,30 +52,6 @@
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="20sp" />
		</FrameLayout>
		<LinearLayout
		android:id="@+id/wps_fields"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">
		<TextView
		android:layout_width="match_parent"
		android:minWidth="128dip"
		android:layout_height="wrap_content"
		android:text="@string/wifi_wps_pin"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="20sp"
		android:gravity="bottom" />

		<EditText
		android:id="@+id/wps_pin"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:inputType="textPassword"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="20sp" />
		</LinearLayout>
		<TableLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -204,44 +180,6 @@
		android:layout_height="wrap_content"
		android:orientation="vertical"/>

		<LinearLayout android:id="@+id/setup_fields"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">

		<TextView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_network_setup" />

		<Spinner android:id="@+id/network_setup"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:prompt="@string/wifi_network_setup"
		android:entries="@array/wifi_network_setup" />

		</LinearLayout>

		<!--
		<LinearLayout android:id="@+id/wps_fields"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">

		<TextView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/wifi_wps_pin" />

		<EditText android:id="@+id/wps_pin"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:inputType="textPassword" />
		</LinearLayout> -->

		<!-- android:id="@+id/security_fields" -->
		<LinearLayout
		android:layout_width="match_parent"

res/values/arrays.xml

+0 −14

Original line number	Diff line number	Diff line
		@@ -438,20 +438,6 @@
		<item>GTC</item>
		</string-array>

		<!-- Wi-Fi set up options -->
		<!-- Note that adding/removing/moving items will need wifi settings code ch
		ange. -->
		<string-array name="wifi_network_setup">
		<!-- Manual wifi configuration [CHAR LIMIT=25]-->
		<item>Off</item>
		<!-- WPS is a new standard that allowes secure connection establishment to a home wireless network using a simplified process. WPS push button based configuration involves pushing a button on the router and the device [CHAR LIMIT=25]-->
		<item>Push button</item>
		<!-- WPS pin method based configuration. This requires entering a pin obtained from the access point [CHAR LIMIT=25] -->
		<item>PIN from access point</item>
		<!-- WPS pin method based configuration. This requires generating a pin from this device [CHAR LIMIT=25] -->
		<item>PIN from this device</item>
		</string-array>

		<!-- Wi-Fi IP settings. -->
		<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
		<string-array name="wifi_ip_settings">

res/values/strings.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -1211,10 +1211,6 @@
		<!-- Dialog for Access Points --> <skip />
		<!-- Label to show/hide advanced options -->
		<string name="wifi_show_advanced">Show advanced options</string>
		<!-- Label for network setup [CHAR LIMIT=50] -->
		<string name="wifi_network_setup">WPS</string>
		<!-- Label for the text view for WPS pin input [CHAR LIMIT=50] -->
		<string name="wifi_wps_pin">Type PIN from access point</string>
		<!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
		<string name="wifi_wps_setup_title">Wi-Fi Protected Setup</string>
		<!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->