commit 38925c0b964b7aef23c8a03af4d1a9499474f1b2
author Robert Greenwalt <robdroid@android.com> Thu Mar 18 15:31:48 2010 -0700
committer Robert Greenwalt <robdroid@android.com> Fri Mar 19 10:27:52 2010 -0700
tree 2479280eac3707d01b58b9a1a74023a177c6e620
parent b3be4d0c5095c6f22d15dc141e4c5c35a18c723c

Choose the Tether help file based on device config

Don't show wifi Tethering help on devices that don't support it, etc.

bug:2520021
Change-Id: I905d1b66fc239d5a5f5028715623d8781041f9ca

src/com/android/settings/TetherSettings.java

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 4095e86..049f912 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -46,7 +46,9 @@
     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 static final String USB_HELP_MODIFIER = "usb_";
+    private static final String WIFI_HELP_MODIFIER = "wifi_";
+    private static final String HELP_URL = "file:///android_asset/html/%y_%z/tethering_%xhelp.html";
 
     private CheckBoxPreference mUsbTether;
 
@@ -245,6 +247,16 @@
             Locale locale = Locale.getDefault();
             String url = HELP_URL.replace("%y", locale.getLanguage().toLowerCase());
             url = url.replace("%z", locale.getCountry().toLowerCase());
+
+            if ((mUsbRegexs.length != 0) && (mWifiRegexs.length == 0)) {
+                url = url.replace("%x", USB_HELP_MODIFIER);
+            } else if ((mWifiRegexs.length != 0) && (mUsbRegexs.length == 0)) {
+                url = url.replace("%x", WIFI_HELP_MODIFIER);
+            } else {
+                // could assert that both wifi and usb have regexs, but the default
+                // is to use this anyway so no check is needed
+                url = url.replace("%x", "");
+            }
             WebView view = new WebView(this);
             view.loadUrl(url);