Skip to content
Browse files

Merge remote branch 'defy/rewrite' into rewrite

  • Loading branch information...
2 parents f5e9d8d + c0026b1 commit 99bd5f22164e9753b9e873decf7b1949474999b8 @nadlabak committed Aug 24, 2011
Showing with 9 additions and 6 deletions.
  1. +2 −0 res/values-fr/strings.xml
  2. +7 −6 src/com/motorola/usb/UsbService.java
View
2 res/values-fr/strings.xml
@@ -12,4 +12,6 @@
<string name="usb_mode_rndis">Réseau USB</string>
<string name="usb_mode_modem">Téléphone en tant que modem</string>
<string name="usb_mode_none">Chargement uniquement</string>
+ <string name="preparing_ums">Préparation de la carte SD...</string>
+ <string name="ums_ready">La carte SD est maintenant accessible par USB.</string>
</resources>
View
13 src/com/motorola/usb/UsbService.java
@@ -442,9 +442,11 @@ private synchronized void handleUsbEvent(int event) {
currentMode = getCurrentUsbMode();
if (mIsSwitchFrom != USB_SWITCH_FROM_IDLE) {
- showConnectedToast(currentMode);
- setUsbConnectionNotificationVisibility(true, false);
- enableInternalDataConnectivity(currentMode != USB_MODE_MODEM);
+ if (mIsSwitchFrom != USB_SWITCH_FROM_ADB) {
+ showConnectedToast(currentMode);
+ setUsbConnectionNotificationVisibility(true, false);
+ enableInternalDataConnectivity(currentMode != USB_MODE_MODEM);
+ }
emitReconfigurationIntent(true);
updateUsbStateFile(true, currentMode);
}
@@ -488,9 +490,8 @@ private synchronized void handleUsbEvent(int event) {
if (mIsSwitchFrom == USB_SWITCH_FROM_UI
|| mIsSwitchFrom == USB_SWITCH_FROM_AT_CMD
- || mIsSwitchFrom == USB_SWITCH_FROM_USBD) {
- mUsbListener.sendUsbModeSwitchCmd(getSwitchCommand(mNewUsbMode));
- } else if (mIsSwitchFrom == USB_SWITCH_FROM_ADB) {
+ || mIsSwitchFrom == USB_SWITCH_FROM_USBD
+ || mIsSwitchFrom == USB_SWITCH_FROM_ADB) {
mUsbListener.sendUsbModeSwitchCmd(getSwitchCommand(currentMode));
}
}

0 comments on commit 99bd5f2

Please sign in to comment.
Something went wrong with that request. Please try again.