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

Merge "Update Tether Settings UI."

Browse Source
This commit is contained in:
Robert Greenwalt
2010-03-04 13:26:29 -08:00
committed by Android (Google) Code Review
parent f4c4b59f13 0affd6a002
commit 5e3c7670a2
3 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -1352,10 +1352,6 @@
<!-- Title of the screen for adjusting tethering settings --> <!-- Title of the screen for adjusting tethering settings -->
<string name="tether_screen_title">Tethering settings</string> <string name="tether_screen_title">Tethering settings</string>
<!-- Tethering notification toggle - controls whether a notification will appear when a tetherable connection becomes available -->
<string name="enable_tether_notice_checkbox">Notifications</string>
<!-- Tethering notification summary explains the notification toggle -->
<string name="enable_tether_notice_checkbox_summary">Show a notification when USB tethering is available</string>
<!-- USB Tethering options --> <!-- USB Tethering options -->
<string name="usb_tethering_button_text">USB tethering</string> <string name="usb_tethering_button_text">USB tethering</string>
<!-- USB available subtext - shown when USB is connected but not currently being tethered --> <!-- USB available subtext - shown when USB is connected but not currently being tethered -->

5
res/xml/tether_prefs.xml
View File

@@ -27,9 +27,4 @@
android:targetClass="com.android.internal.app.TetherActivity" /> android:targetClass="com.android.internal.app.TetherActivity" />
</PreferenceScreen> </PreferenceScreen>
<CheckBoxPreference
android:key="enable_tether_notice"
android:title="@string/enable_tether_notice_checkbox"
android:summary="@string/enable_tether_notice_checkbox_summary"/>
</PreferenceScreen> </PreferenceScreen>

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

@@ -36,11 +36,8 @@ import java.util.ArrayList;
* Displays preferences for Tethering. * Displays preferences for Tethering.
*/ */
public class TetherSettings extends PreferenceActivity { public class TetherSettings extends PreferenceActivity {
private static final String ENABLE_TETHER_NOTICE = "enable_tether_notice";
private static final String USB_TETHER_SETTINGS = "usb_tether_settings"; private static final String USB_TETHER_SETTINGS = "usb_tether_settings";
private CheckBoxPreference mEnableTetherNotice;
private PreferenceScreen mUsbTether; private PreferenceScreen mUsbTether;
private BroadcastReceiver mTetherChangeReceiver; private BroadcastReceiver mTetherChangeReceiver;
@@ -57,7 +54,6 @@ public class TetherSettings extends PreferenceActivity {
addPreferencesFromResource(R.xml.tether_prefs); addPreferencesFromResource(R.xml.tether_prefs);
mEnableTetherNotice = (CheckBoxPreference) findPreference(ENABLE_TETHER_NOTICE);
mUsbTether = (PreferenceScreen) findPreference(USB_TETHER_SETTINGS); mUsbTether = (PreferenceScreen) findPreference(USB_TETHER_SETTINGS);
ConnectivityManager cm = ConnectivityManager cm =
@@ -65,7 +61,6 @@ public class TetherSettings extends PreferenceActivity {
mUsbRegexs = cm.getTetherableUsbRegexs(); mUsbRegexs = cm.getTetherableUsbRegexs();
if (mUsbRegexs.length == 0) { if (mUsbRegexs.length == 0) {
getPreferenceScreen().removePreference(mUsbTether); getPreferenceScreen().removePreference(mUsbTether);
getPreferenceScreen().removePreference(mEnableTetherNotice);
} }
mWifiRegexs = cm.getTetherableWifiRegexs(); mWifiRegexs = cm.getTetherableWifiRegexs();
} }
@@ -88,8 +83,6 @@ public class TetherSettings extends PreferenceActivity {
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
mEnableTetherNotice.setChecked(Settings.Secure.getInt(getContentResolver(),
Settings.Secure.TETHER_NOTIFY, 0) != 0);
IntentFilter filter = new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED); IntentFilter filter = new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
filter.addAction(Intent.ACTION_MEDIA_SHARED); filter.addAction(Intent.ACTION_MEDIA_SHARED);
@@ -160,17 +153,4 @@ public class TetherSettings extends PreferenceActivity {
mUsbTether.setEnabled(false); mUsbTether.setEnabled(false);
} }
} }
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
if (preference == mEnableTetherNotice) {
boolean newState = mEnableTetherNotice.isChecked();
Settings.Secure.putInt(getContentResolver(),
Settings.Secure.TETHER_NOTIFY, newState ? 1 : 0);
return true;
}
return false;
}
} }