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

Allow disabling both MTP and PTP.

Browse Source 
Require that MTP and PTP are mutually exclusive when enabled, but
allow them to be both disabled.  Users can enable them again under
Storage menu item in Settings.

Bug: 6518257
Change-Id: I43419fa619ce2c62dd5e8c14d6c645d24fd8943a
This commit is contained in:
Jeff Sharkey
2013-03-18 15:46:28 -07:00
parent 3c8a4c3b59
commit cfd328b64f
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/deviceinfo/UsbSettings.java
View File

@@ -123,7 +123,6 @@ public class UsbSettings extends SettingsPreferenceFragment {
mMtp.setEnabled(false); mMtp.setEnabled(false);
mPtp.setEnabled(false); mPtp.setEnabled(false);
} }
} }
@Override @Override
@@ -134,22 +133,17 @@ public class UsbSettings extends SettingsPreferenceFragment {
if (Utils.isMonkeyRunning()) { if (Utils.isMonkeyRunning()) {
return true; return true;
} }
// temporary hack - using check boxes as radio buttons
// don't allow unchecking them String function = "none";
if (preference instanceof CheckBoxPreference) { if (preference == mMtp && mMtp.isChecked()) {
CheckBoxPreference checkBox = (CheckBoxPreference)preference; function = UsbManager.USB_FUNCTION_MTP;
if (!checkBox.isChecked()) { } else if (preference == mPtp && mPtp.isChecked()) {
checkBox.setChecked(true); function = UsbManager.USB_FUNCTION_PTP;
return true;
}
}
if (preference == mMtp) {
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP, true);
updateToggles(UsbManager.USB_FUNCTION_MTP);
} else if (preference == mPtp) {
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP, true);
updateToggles(UsbManager.USB_FUNCTION_PTP);
} }
mUsbManager.setCurrentFunction(function, true);
updateToggles(function);
return true; return true;
} }
} }