diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-03-15 17:21:16 -0700 |
|---|---|---|
| committer | Robert Greenwalt <robdroid@android.com> | 2010-03-15 17:21:16 -0700 |
| commit | c3c93e5c6226863d09748160a0bfab00aebf0b9d (patch) | |
| tree | 0d89b710aa347973701b54140d5562cb7eb38fe4 /src | |
| parent | f0ed2f3f3175457825a0b49cab72f9cb78c3b997 (diff) | |
| download | packages_apps_Settings-c3c93e5c6226863d09748160a0bfab00aebf0b9d.zip packages_apps_Settings-c3c93e5c6226863d09748160a0bfab00aebf0b9d.tar.gz packages_apps_Settings-c3c93e5c6226863d09748160a0bfab00aebf0b9d.tar.bz2 | |
Add Tether Help UI.
Add a "Help" button to the tethering page that loads on-device html.
Change-Id: I816ec552a4433296a6cb57345a37611eb2a92b37
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/TetherSettings.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index f49d577..eea45c4 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -18,6 +18,7 @@ package com.android.settings; import com.android.settings.wifi.WifiApEnabler; +import android.app.AlertDialog; import android.os.Bundle; import android.os.SystemProperties; import android.content.BroadcastReceiver; @@ -32,8 +33,10 @@ import android.preference.PreferenceActivity; import android.preference.PreferenceScreen; import android.provider.Settings; import android.util.Log; +import android.webkit.WebView; import java.util.ArrayList; +import java.util.Locale; /* * Displays preferences for Tethering. @@ -42,12 +45,15 @@ public class TetherSettings extends PreferenceActivity { private static final String USB_TETHER_SETTINGS = "usb_tether_settings"; private static final String ENABLE_WIFI_AP = "enable_wifi_ap"; private static final String WIFI_AP_SETTINGS = "wifi_ap_settings"; + private static final String TETHERING_HELP = "tethering_help"; + private static final String HELP_URL = "file:///android_asset/html/%y_%z/tethering_help.html"; private CheckBoxPreference mUsbTether; private CheckBoxPreference mEnableWifiAp; private PreferenceScreen mWifiApSettings; private WifiApEnabler mWifiApEnabler; + private PreferenceScreen mTetherHelp; private BroadcastReceiver mTetherChangeReceiver; @@ -66,6 +72,7 @@ public class TetherSettings extends PreferenceActivity { mEnableWifiAp = (CheckBoxPreference) findPreference(ENABLE_WIFI_AP); mWifiApSettings = (PreferenceScreen) findPreference(WIFI_AP_SETTINGS); mUsbTether = (CheckBoxPreference) findPreference(USB_TETHER_SETTINGS); + mTetherHelp = (PreferenceScreen) findPreference(TETHERING_HELP); ConnectivityManager cm = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE); @@ -252,6 +259,17 @@ public class TetherSettings extends PreferenceActivity { } mUsbTether.setSummary(""); } + } else if (preference == mTetherHelp) { + Locale locale = Locale.getDefault(); + String url = HELP_URL.replace("%y", locale.getLanguage().toLowerCase()); + url = url.replace("%z", locale.getCountry().toLowerCase()); + WebView view = new WebView(this); + view.loadUrl(url); + + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setCancelable(true); + builder.setView(view); + builder.show(); } return false; } |
