diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-03-05 19:00:30 -0800 |
|---|---|---|
| committer | Robert Greenwalt <robdroid@android.com> | 2010-03-09 11:19:37 -0800 |
| commit | 204e7c1a6ed3ad9c89e6e10fc59fc8551817c2be (patch) | |
| tree | b9144c937458062560e7bb7890580b6ae0990880 /res | |
| parent | b7411b49c70133adebd8488a7180e8ac14c4058c (diff) | |
| download | packages_apps_Settings-204e7c1a6ed3ad9c89e6e10fc59fc8551817c2be.zip packages_apps_Settings-204e7c1a6ed3ad9c89e6e10fc59fc8551817c2be.tar.gz packages_apps_Settings-204e7c1a6ed3ad9c89e6e10fc59fc8551817c2be.tar.bz2 | |
Clean up the tethering settings screen a bit.
Change-Id: Iadd1cf9245a5ccd38537050a6b6c9d9390400b20
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 7 | ||||
| -rw-r--r-- | res/xml/tether_prefs.xml | 36 |
2 files changed, 15 insertions, 28 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index edf0ddc..4499cc1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -726,8 +726,6 @@ <string name="bluetooth_dock_settings_remember">Remember settings</string> <!-- Wi-Fi Settings --> <skip /> - <!-- Used in the 2nd-level settings screen to turn on Wi-Fi --> - <string name="wifi">Wi-Fi</string> <!-- Used in the 1st-level settings screen to turn on Wi-Fi --> <string name="wifi_quick_toggle_title">Wi-Fi</string> <!-- Used in the 1st-level settings screen as the turn-on summary --> @@ -1398,11 +1396,6 @@ <!-- Thethering help button - calls up a web view with general tethering info --> <string name="tethering_help_button_text">Tethering help</string> - <!-- Tethered notification text - shown in the notification bar when tethering is active --> - <string name="tethered_notifcation_title">Tethering active</string> - <!-- Tethered notification message - shown under the notification title --> - <string name="tethered_notification_message">Touch to configure</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 index bdf693f..d9ba2c5 100644 --- a/res/xml/tether_prefs.xml +++ b/res/xml/tether_prefs.xml @@ -22,26 +22,20 @@ android:title="@string/usb_tethering_button_text" android:persistent="false" /> - <PreferenceCategory - android:key="wifi_category" - android:title="@string/wifi"> - - <CheckBoxPreference - android:key="enable_wifi_ap" - android:title="@string/wifi_tether_checkbox_text" - android:persistent="false" /> - - <PreferenceScreen - android:key="wifi_ap_settings" - android:dependency="enable_wifi_ap" - android:title="@string/wifi_tether_settings_text" - android:summary="@string/wifi_tether_settings_subtext" > - <intent - android:action="android.intent.action.MAIN" - android:targetPackage="com.android.settings" - android:targetClass="com.android.settings.wifi.WifiApSettings" /> - </PreferenceScreen> - - </PreferenceCategory> + <CheckBoxPreference + android:key="enable_wifi_ap" + android:title="@string/wifi_tether_checkbox_text" + android:persistent="false" /> + + <PreferenceScreen + android:key="wifi_ap_settings" + android:dependency="enable_wifi_ap" + android:title="@string/wifi_tether_settings_text" + android:summary="@string/wifi_tether_settings_subtext" > + <intent + android:action="android.intent.action.MAIN" + android:targetPackage="com.android.settings" + android:targetClass="com.android.settings.wifi.WifiApSettings" /> + </PreferenceScreen> </PreferenceScreen> |