PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get all strings in for Wifi tethering

Browse Source 
Bug: 2413908
Change-Id: I3d28fcfcb4a6e4eaf03e57d69f9d2c92730b12e5
This commit is contained in:
Irfan Sheriff
2010-03-04 17:26:37 -08:00
parent a08f5a5b8c
commit 2ae37e8ce0
5 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
res/values/strings.xml
View File

@@ -846,28 +846,27 @@
<string name="wifi_gateway">Gateway</string> <string name="wifi_gateway">Gateway</string>
<!-- Label for the netmask of the network --> <!-- Label for the netmask of the network -->
<string name="wifi_netmask">Netmask</string> <string name="wifi_netmask">Netmask</string>
<!-- Alert message to indicate Wi-Fi AP will be disabled to enable station mode operation-->
<string name="wifi_ap_disable_message">Wi-fi Access Point for tethering is currently enabled. Turning Wi-fi on will disable Access Point operation.</string>
<!-- Wifi AP settings--> <!-- Wifi AP settings-->
<!-- Title for Wifi AP tether settings--> <!-- Label for wifi tether checkbox. Toggles Access Point on/off -->
<string name="wifi_ap_title">Wi-Fi</string> <string name="wifi_tether_checkbox_text">Wi-Fi tethering</string>
<!-- Label for checkbox. Toggles Access Point on/off --> <!-- Subtext for wifi tether checkbox on success -->
<string name="wifi_ap">Wi-Fi AP</string> <string name="wifi_tether_enabled_subtext">Access point <xliff:g id="network_ssid">%1$s</xliff:g> active</string>
<!-- Summary for the AP toggle checkbox. --> <!-- Subtext for wifi tether checkbox on failure -->
<string name="wifi_ap_summary">Set as Access Point</string> <string name="wifi_tether_failed_subtext">Wi-Fi tethering error</string>
<!-- Title of the Wi-fi settings screen and label for the settings preference--> <!-- Label for Wi-fi tether settings preference -->
<string name="wifi_ap_settings">Wi-Fi AP settings</string> <string name="wifi_tether_settings_text">Wi-Fi tethering settings</string>
<!-- Summary for the settings preference. --> <!-- Subtext for Wi-fi tether settings preference -->
<string name="wifi_ap_settings_summary">Set up &amp; manage Access Point</string> <string name="wifi_tether_settings_subtext">Set up &amp; manage access point</string>
<!-- Used to open the ssid and security dialog for Wifi Access Point--> <!-- Title of the Wi-fi settings screen -->
<string name="wifi_ap_ssid_and_security">SSID and Security</string> <string name="wifi_tether_settings_title">Wi-Fi tethering settings</string>
<!-- Action message to configure Access Point ssid and security--> <!-- Used to open the ssid and security dialog for Wifi Access Point -->
<string name="wifi_ap_configure_network">Configure AP</string> <string name="wifi_tether_configure_ap_text">Configure AP</string>
<!-- Used to open the channel selection dialog --> <!-- Subtext on configuration preference to indicate SSID and security chosen -->
<string name="wifi_ap_channel">Channel </string> <string name="wifi_tether_configure_subtext"><xliff:g id="network_ssid">%1$s</xliff:g> <xliff:g id="network_security">%2$s</xliff:g> access point</string>
<!-- The Toast message shown to user when tethering is enabled with Wifi on--> <!-- Default access point SSID used for tethering -->
<string name="wifi_ap_tether_message">Enabling Wi-fi Access Point for tethering. This will reset any existing Wi-fi connection and stop Wi-fi station mode operation.</string> <string name="wifi_tether_configure_ssid_default">AndroidAP</string>
<!-- Do not translate. Used for diagnostic screens, precise translation is not necessary <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
Wi-Fi Testing on the diagnostic screen--> Wi-Fi Testing on the diagnostic screen-->

9
res/xml/tether_prefs.xml
View File

@@ -35,19 +35,18 @@
<PreferenceCategory <PreferenceCategory
android:key="wifi_category" android:key="wifi_category"
android:title="@string/wifi_ap_title"> android:title="@string/wifi">
<CheckBoxPreference <CheckBoxPreference
android:key="enable_wifi_ap" android:key="enable_wifi_ap"
android:title="@string/wifi_ap" android:title="@string/wifi_tether_checkbox_text"
android:summary="@string/wifi_ap_summary"
android:persistent="false" /> android:persistent="false" />
<PreferenceScreen <PreferenceScreen
android:key="wifi_ap_settings" android:key="wifi_ap_settings"
android:dependency="enable_wifi_ap" android:dependency="enable_wifi_ap"
android:title="@string/wifi_ap_settings" android:title="@string/wifi_tether_settings_text"
android:summary="@string/wifi_ap_settings_summary" > android:summary="@string/wifi_tether_settings_subtext" >
<intent <intent
android:action="android.intent.action.MAIN" android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings" android:targetPackage="com.android.settings"

10
res/xml/wifi_ap_settings.xml
View File

@@ -15,24 +15,24 @@
--> -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/wifi_settings_category"> android:title="@string/wifi_tether_settings_title">
<CheckBoxPreference <CheckBoxPreference
android:key="enable_wifi_ap" android:key="enable_wifi_ap"
android:title="@string/wifi_ap" android:title="@string/wifi_tether_checkbox_text"
android:summary="@string/wifi_ap_summary"
android:persistent="false" /> android:persistent="false" />
<Preference <Preference
android:key="wifi_ap_ssid_and_security" android:key="wifi_ap_ssid_and_security"
android:dependency="enable_wifi_ap" android:dependency="enable_wifi_ap"
android:title="@string/wifi_ap_ssid_and_security" android:title="@string/wifi_tether_configure_ap_text"
android:persistent="false" /> android:persistent="false" />
<!-- TODO: Channel setting will go away -->
<ListPreference <ListPreference
android:key="wifi_ap_channel" android:key="wifi_ap_channel"
android:dependency="enable_wifi_ap" android:dependency="enable_wifi_ap"
android:title="@string/wifi_ap_channel" android:title="Channel"
android:persistent="false" /> android:persistent="false" />
</PreferenceScreen> </PreferenceScreen>

2
src/com/android/settings/wifi/WifiApDialog.java
View File

@@ -119,7 +119,7 @@ class WifiApDialog extends AlertDialog implements View.OnClickListener,
Context context = getContext(); Context context = getContext();
setTitle(R.string.wifi_ap_configure_network); setTitle(R.string.wifi_tether_configure_ap_text);
mView.findViewById(R.id.type).setVisibility(View.VISIBLE); mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
mSsid = (TextView) mView.findViewById(R.id.ssid); mSsid = (TextView) mView.findViewById(R.id.ssid);
mPassword = (EditText) mView.findViewById(R.id.password); mPassword = (EditText) mView.findViewById(R.id.password);

5
src/com/android/settings/wifi/WifiApEnabler.java
View File

@@ -86,7 +86,10 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener,
if (enable && mWifiManager.isWifiEnabled()) { if (enable && mWifiManager.isWifiEnabled()) {
AlertDialog.Builder builder = new AlertDialog.Builder(mContext); AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
builder.setMessage(R.string.wifi_ap_tether_message) /**
* TODO: this alert will go away.
*/
builder.setMessage("Turning off Wifi client. Enabling Wifi tethering")
.setCancelable(false) .setCancelable(false)
.setPositiveButton(android.R.string.ok, this) .setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, this); .setNegativeButton(android.R.string.cancel, this);