diff options
author | Robert Greenwalt <robdroid@android.com> | 2010-01-26 10:22:37 -0800 |
---|---|---|
committer | Robert Greenwalt <robdroid@android.com> | 2010-02-04 09:17:41 -0800 |
commit | 3901edbdf5cb7b14d4773b3fc7adb3181519855c (patch) | |
tree | 5db5694a954542ce9617d669e5295366b44a887a /res | |
parent | 9dee8a96c5682aebff50adc8c87519ee6c36e3ef (diff) | |
download | packages_apps_settings-3901edbdf5cb7b14d4773b3fc7adb3181519855c.zip packages_apps_settings-3901edbdf5cb7b14d4773b3fc7adb3181519855c.tar.gz packages_apps_settings-3901edbdf5cb7b14d4773b3fc7adb3181519855c.tar.bz2 |
First pass at USB-only tether settings.
bug:2281900
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 21 | ||||
-rw-r--r-- | res/xml/tether_prefs.xml | 35 | ||||
-rw-r--r-- | res/xml/wireless_settings.xml | 9 |
3 files changed, 65 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 0d40330..d145841 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1256,6 +1256,27 @@ <!-- Main settings screen, Call settings summary for item to go into call settings --> <string name="call_settings_summary">Set up voicemail, call forwarding, call waiting, caller ID</string> + <!-- Tethering controls, item title to go into the tethering settings --> + <string name="tether_settings_title">Tethering settings</string> + <!-- Tethering controls, the item summary for the user to go into the tethering settings --> + <string name="tether_settings_summary">Set up and manage tethering</string> + + <!-- Title of the screen for adjusting tethering settings --> + <string name="tether_screen_title">Tethering settings</string> + + <!-- Tethering notification toggle - controls whether a notification will appear when a tetherable connection becomes available --> + <string name="enable_tether_notice_checkbox">Notifications</string> + <!-- Tethering notification summary explains the notification toggle --> + <string name="enable_tether_notice_checkbox_summary">Show a notification when USB tethering is available</string> + <!-- USB Tethering options --> + <string name="usb_tethering_button_text">USB tethering</string> + <!-- USB available subtext - shown when USB is connected but not currently being tethered --> + <string name="usb_tethering_available_subtext">USB connected, select to tether</string> + <!-- USB tethered subtext - shown when USB is connected and being tethered --> + <string name="usb_tethering_active_subtext">Connected, select to disconnect</string> + <!-- USB unavailable subtext - shown when USB is not connected --> + <string name="usb_tethering_unavailable_subtext">USB not connected</string> + <!-- Wireless controls, item title to go into the network settings --> <string name="network_settings_title">Mobile networks</string> <!-- Wireless controls, the item summary for the user to go into the network settings --> diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml new file mode 100644 index 0000000..321129f --- /dev/null +++ b/res/xml/tether_prefs.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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. +--> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + android:title="@string/tether_screen_title"> + + <PreferenceScreen + android:key="usb_tether_settings" + android:title="@string/usb_tethering_button_text" + android:widgetLayout="@*android:layout/preference_dialog" > + <intent + android:action="android.intent.action.MAIN" + android:targetPackage="android" + android:targetClass="com.android.internal.app.TetherActivity" /> + </PreferenceScreen> + + <CheckBoxPreference + android:key="enable_tether_notice" + android:title="@string/enable_tether_notice_checkbox" + android:summary="@string/enable_tether_notice_checkbox_summary"/> + +</PreferenceScreen> diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 2493021..9977505 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -57,6 +57,15 @@ </PreferenceScreen> <PreferenceScreen + android:title="@string/tether_settings_title" + android:summary="@string/tether_settings_summary"> + <intent + android:action="android.intent.action.MAIN" + android:targetPackage="com.android.settings" + android:targetClass="com.android.settings.TetherSettings" /> + </PreferenceScreen> + + <PreferenceScreen android:key="vpn_settings" android:title="@string/vpn_settings_title" android:summary="@string/vpn_settings_summary" > |