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

am 4c3b2f0c: Fix the tethering help page.

Browse Source 
Merge commit '4c3b2f0cf062b38a6e380cc15ff8dc9abdca518b' into froyo-plus-aosp

* commit '4c3b2f0cf062b38a6e380cc15ff8dc9abdca518b':
  Fix the tethering help page.
This commit is contained in:
Robert Greenwalt
2010-04-21 13:04:30 -07:00
committed by Android Git Automerger
parent 2c3265af74 4c3b2f0cf0
commit 70631ab714
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/TetherSettings.java
View File

@@ -26,6 +26,7 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.res.AssetManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.os.Environment; import android.os.Environment;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
@@ -36,6 +37,7 @@ import android.provider.Settings;
import android.util.Log; import android.util.Log;
import android.webkit.WebView; import android.webkit.WebView;
import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale; import java.util.Locale;
@@ -49,7 +51,8 @@ public class TetherSettings extends PreferenceActivity {
private static final String TETHERING_HELP = "tethering_help"; private static final String TETHERING_HELP = "tethering_help";
private static final String USB_HELP_MODIFIER = "usb_"; private static final String USB_HELP_MODIFIER = "usb_";
private static final String WIFI_HELP_MODIFIER = "wifi_"; private static final String WIFI_HELP_MODIFIER = "wifi_";
private static final String HELP_URL = "file:///android_asset/html/%y_%z/tethering_%xhelp.html"; private static final String HELP_URL = "file:///android_asset/html/%y%z/tethering_%xhelp.html";
private static final String HELP_PATH = "html/%y%z/tethering_help.html";
private static final int DIALOG_TETHER_HELP = 1; private static final int DIALOG_TETHER_HELP = 1;
@@ -100,9 +103,26 @@ public class TetherSettings extends PreferenceActivity {
protected Dialog onCreateDialog(int id) { protected Dialog onCreateDialog(int id) {
if (id == DIALOG_TETHER_HELP) { if (id == DIALOG_TETHER_HELP) {
Locale locale = Locale.getDefault(); Locale locale = Locale.getDefault();
String url = HELP_URL.replace("%y", locale.getLanguage().toLowerCase());
url = url.replace("%z", locale.getCountry().toLowerCase());
// check for the full language + country resource, if not there, try just language
AssetManager am = getAssets();
String path = HELP_PATH.replace("%y", locale.getLanguage().toLowerCase());
path = path.replace("%z", "_"+locale.getCountry().toLowerCase());
boolean useCountry = true;
InputStream is = null;
try {
is = am.open(path);
} catch (Exception e) {
useCountry = false;
} finally {
if (is != null) {
try {
is.close();
} catch (Exception e) {}
}
}
String url = HELP_URL.replace("%y", locale.getLanguage().toLowerCase());
url = url.replace("%z", (useCountry ? "_"+locale.getCountry().toLowerCase() : ""));
if ((mUsbRegexs.length != 0) && (mWifiRegexs.length == 0)) { if ((mUsbRegexs.length != 0) && (mWifiRegexs.length == 0)) {
url = url.replace("%x", USB_HELP_MODIFIER); url = url.replace("%x", USB_HELP_MODIFIER);
} else if ((mWifiRegexs.length != 0) && (mUsbRegexs.length == 0)) { } else if ((mWifiRegexs.length != 0) && (mUsbRegexs.length == 0)) {
@@ -112,6 +132,7 @@ public class TetherSettings extends PreferenceActivity {
// is to use this anyway so no check is needed // is to use this anyway so no check is needed
url = url.replace("%x", ""); url = url.replace("%x", "");
} }
mView.loadUrl(url); mView.loadUrl(url);
return new AlertDialog.Builder(this) return new AlertDialog.Builder(this)