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

am e434bfb2: String change - wifi tether = hotspot

Browse Source 
Merge commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7' into froyo-plus-aosp

* commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7':
  String change - wifi tether = hotspot
This commit is contained in:
Robert Greenwalt
2010-05-10 10:14:36 -07:00
committed by Android Git Automerger
parent 15bb475456 e434bfb216
commit 482eadeae8
7 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,12 +88,19 @@ public class TetherSettings extends PreferenceActivity {
mUsbRegexs = cm.getTetherableUsbRegexs();
if (mUsbRegexs.length == 0) {
getPreferenceScreen().removePreference(mUsbTether);
setTitle(R.string.tether_settings_title_wifi);
}
mWifiRegexs = cm.getTetherableWifiRegexs();
if (mWifiRegexs.length == 0) {
getPreferenceScreen().removePreference(mEnableWifiAp);
getPreferenceScreen().removePreference(mWifiApSettings);
setTitle(R.string.tether_settings_title_usb);
} else if (mUsbRegexs.length != 0) {
// have both
setTitle(R.string.tether_settings_title_both);
}
mWifiApEnabler = new WifiApEnabler(this, mEnableWifiAp);
mView = new WebView(this);

16
src/com/android/settings/WirelessSettings.java
View File

@@ -123,6 +123,22 @@ public class WirelessSettings extends PreferenceActivity {
(ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
if (!cm.isTetheringSupported()) {
getPreferenceScreen().removePreference(findPreference(KEY_TETHER_SETTINGS));
} else {
String[] usbRegexs = cm.getTetherableUsbRegexs();
String[] wifiRegexs = cm.getTetherableWifiRegexs();
Preference p = findPreference(KEY_TETHER_SETTINGS);
if (wifiRegexs.length == 0) {
p.setTitle(R.string.tether_settings_title_usb);
p.setSummary(R.string.tether_settings_summary_usb);
} else {
if (usbRegexs.length == 0) {
p.setTitle(R.string.tether_settings_title_wifi);
p.setSummary(R.string.tether_settings_summary_wifi);
} else {
p.setTitle(R.string.tether_settings_title_both);
p.setSummary(R.string.tether_settings_summary_both);
}
}
}
}