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

UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.

Browse Source 
Add accessory flag to track accessory status. Disable MTP/PTP button
when Usb is working in accessory mode.

Change-Id: I3edcd2a7eb281db3bb9d345429643b77a237812e
Author: Wu, Hao <hao.wu@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 27200
This commit is contained in:
Wu, Hao
2012-07-20 23:12:14 +08:00
committed by Xiaokang Qin
parent 5dbc1f6405
commit b76be1f8d4
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,9 +49,15 @@ public class UsbSettings extends SettingsPreferenceFragment {
private UsbManager mUsbManager; private UsbManager mUsbManager;
private CheckBoxPreference mMtp; private CheckBoxPreference mMtp;
private CheckBoxPreference mPtp; private CheckBoxPreference mPtp;
private boolean mUsbAccessoryMode;
private final BroadcastReceiver mStateReceiver = new BroadcastReceiver() { private final BroadcastReceiver mStateReceiver = new BroadcastReceiver() {
public void onReceive(Context content, Intent intent) { public void onReceive(Context content, Intent intent) {
String action = intent.getAction();
if (action.equals(UsbManager.ACTION_USB_STATE)) {
mUsbAccessoryMode = intent.getBooleanExtra(UsbManager.USB_FUNCTION_ACCESSORY, false);
Log.e(TAG, "UsbAccessoryMode " + mUsbAccessoryMode);
}
updateToggles(mUsbManager.getDefaultFunction()); updateToggles(mUsbManager.getDefaultFunction());
} }
}; };
@@ -106,6 +112,18 @@ public class UsbSettings extends SettingsPreferenceFragment {
mMtp.setChecked(false); mMtp.setChecked(false);
mPtp.setChecked(false); mPtp.setChecked(false);
} }
if (!mUsbAccessoryMode) {
//Enable MTP and PTP switch while USB is not in Accessory Mode, otherwise disable it
Log.e(TAG, "USB Normal Mode");
mMtp.setEnabled(true);
mPtp.setEnabled(true);
} else {
Log.e(TAG, "USB Accessory Mode");
mMtp.setEnabled(false);
mPtp.setEnabled(false);
}
} }
@Override @Override