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

Merge "Update Tether Settings for new UMS behavior."

Browse Source
This commit is contained in:
Robert Greenwalt
2010-03-10 17:24:57 -08:00
committed by Android (Google) Code Review
parent 2348a9db51 a2488762a7
commit 7785e508b7
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,15 +85,19 @@ public class TetherSettings extends PreferenceActivity {
private class TetherChangeReceiver extends BroadcastReceiver { private class TetherChangeReceiver extends BroadcastReceiver {
public void onReceive(Context content, Intent intent) { public void onReceive(Context content, Intent intent) {
// TODO - this should understand the interface types if (intent.getAction().equals(ConnectivityManager.ACTION_TETHER_STATE_CHANGED)) {
ArrayList<String> available = intent.getStringArrayListExtra( // TODO - this should understand the interface types
ConnectivityManager.EXTRA_AVAILABLE_TETHER); ArrayList<String> available = intent.getStringArrayListExtra(
ArrayList<String> active = intent.getStringArrayListExtra( ConnectivityManager.EXTRA_AVAILABLE_TETHER);
ConnectivityManager.EXTRA_ACTIVE_TETHER); ArrayList<String> active = intent.getStringArrayListExtra(
ArrayList<String> errored = intent.getStringArrayListExtra( ConnectivityManager.EXTRA_ACTIVE_TETHER);
ConnectivityManager.EXTRA_ERRORED_TETHER); ArrayList<String> errored = intent.getStringArrayListExtra(
ConnectivityManager.EXTRA_ERRORED_TETHER);
updateState(available.toArray(), active.toArray(), errored.toArray()); updateState(available.toArray(), active.toArray(), errored.toArray());
} else if (intent.getAction().equals(Intent.ACTION_MEDIA_SHARED) ||
intent.getAction().equals(Intent.ACTION_MEDIA_UNSHARED)) {
updateState();
}
} }
} }
@@ -185,10 +189,6 @@ public class TetherSettings extends PreferenceActivity {
mUsbTether.setSummary(R.string.usb_tethering_active_subtext); mUsbTether.setSummary(R.string.usb_tethering_active_subtext);
mUsbTether.setEnabled(true); mUsbTether.setEnabled(true);
mUsbTether.setChecked(true); mUsbTether.setChecked(true);
} else if (massStorageActive) {
mUsbTether.setSummary(R.string.usb_tethering_storage_active_subtext);
mUsbTether.setEnabled(false);
mUsbTether.setChecked(false);
} else if (usbAvailable) { } else if (usbAvailable) {
if (usbError == ConnectivityManager.TETHER_ERROR_NO_ERROR) { if (usbError == ConnectivityManager.TETHER_ERROR_NO_ERROR) {
mUsbTether.setSummary(R.string.usb_tethering_available_subtext); mUsbTether.setSummary(R.string.usb_tethering_available_subtext);
@@ -201,6 +201,10 @@ public class TetherSettings extends PreferenceActivity {
mUsbTether.setSummary(R.string.usb_tethering_errored_subtext); mUsbTether.setSummary(R.string.usb_tethering_errored_subtext);
mUsbTether.setEnabled(false); mUsbTether.setEnabled(false);
mUsbTether.setChecked(false); mUsbTether.setChecked(false);
} else if (massStorageActive) {
mUsbTether.setSummary(R.string.usb_tethering_storage_active_subtext);
mUsbTether.setEnabled(false);
mUsbTether.setChecked(false);
} else { } else {
mUsbTether.setSummary(R.string.usb_tethering_unavailable_subtext); mUsbTether.setSummary(R.string.usb_tethering_unavailable_subtext);
mUsbTether.setEnabled(false); mUsbTether.setEnabled(false);