Permalink
Browse files

Merge remote branch 'defy/rewrite' into rewrite

Conflicts:
	res/values-pt/strings.xml
	src/com/motorola/usb/UsbService.java

Change-Id: I55e77b504666ad8d27254022036dcb1f38b70e9a
  • Loading branch information...
2 parents 21be3c2 + 6daa6b2 commit c149fd0c1b2a563ad76deffcefca74a849dbef04 @nadlabak committed Aug 22, 2011
View
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.motorola.usb">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.motorola.usb">
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
- <uses-permission android:name="com.motorola.android.permission.MOT_USB" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+<!--<uses-permission android:name="com.motorola.android.permission.MOT_USB" />-->
<application android:label="usb" android:persistent="true">
<activity android:theme="@style/UsbDialog" android:name="UsbModeSelectionActivity" android:excludeFromRecents="true" />
<activity android:theme="@style/UsbDialog" android:name="UsbErrorActivity" />
View
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 The Android Open Source Project
+# Copyright (C) 2011 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -44,6 +44,9 @@
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Usb_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Usb_intermediates)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
View
Binary file not shown.
View
@@ -1,24 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
- <string name="usb_period">.</string>
- <string name="usb_ok">OK</string>
- <string name="usb_cancel">Abbrechen</string>
- <string name="usb_3_periods">...</string>
- <string name="usb_toast_connecting_to">Verbindung für</string>
- <string name="usb_toast_phone_data_disabled">Telefondaten wird deaktiviert.</string>
- <string name="usb_no_memory_card_notification_title">Keine Speicherkarte vorhanden.</string>
- <string name="usb_no_memory_card_notification_message_title">Fehlende Speicherkarte</string>
- <string name="usb_no_memory_card_notification_message">Legen Sie eine Speicherkarte ein.</string>
- <string name="usb_selection_notification_title">USB-Verbindung</string>
- <string name="usb_selection_notification_message">Auswählen zum Verwalten Ihrer USB-Verbindung</string>
- <string name="usb_selection_notification_message_for_modem">Für Details und zum Trennen der Verbindung berühren</string>
- <string name="usb_connection">USB-Verbindung</string>
- <string name="usb_mode_ngp">Portal &amp; Tools</string>
- <string name="usb_mode_mtp">Synchronisierung von Windows Media</string>
- <string name="usb_mode_msc">Speicherkarten-Zugriff</string>
- <string name="usb_mode_modem">Telefon als Modem</string>
- <string name="usb_mode_none">Nur Laden</string>
- <string name="usb_toast_insert_card">Legen Sie eine Speicherkarte für Ihre Medien ein.</string>
- <string name="usb_progress_message">Wechseln zu</string>
- <string name="usb_error_message">Die USB-Verbindung kann nicht geändert werden zu</string>
-</resources>
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+ <string name="usb_toast_connecting">USB als \'%s\' verbunden.</string>
+ <string name="usb_toast_phone_data_disabled">Telefondaten werden deaktiviert.</string>
+ <string name="usb_selection_notification_title">USB-Verbindung</string>
+ <string name="usb_selection_notification_message">Auswählen zum Verwalten Ihrer USB-Verbindung</string>
+ <string name="usb_selection_notification_message_for_modem">Für Details und zum Trennen der Verbindung berühren</string>
+ <string name="usb_tethered_message">Die USB-Verbindung kann nicht geändert werden, während USB-Tethering aktiv ist.</string>
+ <string name="usb_connection">USB-Verbindung</string>
+ <string name="usb_mode_ngp">Portal &amp; Tools</string>
+ <string name="usb_mode_mtp">Synchronisierung von Windows Media</string>
+ <string name="usb_mode_msc">Speicherkarten-Zugriff</string>
+ <string name="usb_mode_rndis">USB-Tethering</string>
+ <string name="usb_mode_modem">Telefon als Modem</string>
+ <string name="usb_mode_none">Nur Laden</string>
+ <string name="usb_error_message">Die USB-Verbindung kann nicht zu \'%s\' geändert werden.</string>
+</resources>
View
@@ -1,24 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
- <string name="usb_period">.</string>
- <string name="usb_ok">OK</string>
- <string name="usb_cancel">Άκυρο</string>
- <string name="usb_3_periods">...</string>
- <string name="usb_toast_connecting_to">Σύνδεση για</string>
- <string name="usb_toast_phone_data_disabled">Τα δεδομένα του τηλεφώνου θα απενεργοποιηθούν.</string>
- <string name="usb_no_memory_card_notification_title">Δεν έχετε εισαγάγει κάρτα μνήμης</string>
- <string name="usb_no_memory_card_notification_message_title">Η κάρτα μνήμης λείπει</string>
- <string name="usb_no_memory_card_notification_message">Εισαγάγετε κάρτα μνήμης</string>
- <string name="usb_selection_notification_title">Σύνδεση USB</string>
- <string name="usb_selection_notification_message">Επιλέξτε το για να διαχειρίζεστε τη σύνδεση USB</string>
- <string name="usb_selection_notification_message_for_modem">Πατήστε το για να αποσυνδέσετε και να ενεργοποιήσετε ξανά τα εσωτερικά δεδομένα του τηλεφώνου</string>
- <string name="usb_connection">Σύνδεση USB</string>
- <string name="usb_mode_ngp">Πύλη και εργαλεία</string>
- <string name="usb_mode_mtp">Συγχρονισμός πολυμέσων των Windows</string>
- <string name="usb_mode_msc">Πρόσβαση στην κάρτας μνήμης</string>
- <string name="usb_mode_modem">Τηλέφωνο ως μόντεμ</string>
- <string name="usb_mode_none">Μόνο φόρτιση</string>
- <string name="usb_toast_insert_card">Εισαγάγετε κάρτα μνήμης για τα μέσα σας.</string>
- <string name="usb_progress_message">Αλλαγή σε</string>
- <string name="usb_error_message">Η σύνδεση USB δεν μπορεί να αλλάξει σε</string>
-</resources>
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+ <string name="usb_toast_phone_data_disabled">Τα δεδομένα του τηλεφώνου θα απενεργοποιηθούν.</string>
+ <string name="usb_selection_notification_title">Σύνδεση USB</string>
+ <string name="usb_selection_notification_message">Επιλέξτε το για να διαχειρίζεστε τη σύνδεση USB</string>
+ <string name="usb_selection_notification_message_for_modem">Πατήστε το για να αποσυνδέσετε και να ενεργοποιήσετε ξανά τα εσωτερικά δεδομένα του τηλεφώνου</string>
+ <string name="usb_connection">Σύνδεση USB</string>
+ <string name="usb_mode_ngp">Πύλη και εργαλεία</string>
+ <string name="usb_mode_mtp">Συγχρονισμός πολυμέσων των Windows</string>
+ <string name="usb_mode_msc">Πρόσβαση στην κάρτας μνήμης</string>
+ <string name="usb_mode_modem">Τηλέφωνο ως μόντεμ</string>
+ <string name="usb_mode_none">Μόνο φόρτιση</string>
+</resources>
@@ -1,24 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
- <string name="usb_period">.</string>
- <string name="usb_ok">OK</string>
- <string name="usb_cancel">Cancel</string>
- <string name="usb_3_periods">...</string>
- <string name="usb_toast_connecting_to">Connecting for</string>
- <string name="usb_toast_phone_data_disabled">Phone data will be disabled.</string>
- <string name="usb_no_memory_card_notification_title">No memory card inserted</string>
- <string name="usb_no_memory_card_notification_message_title">Missing memory card</string>
- <string name="usb_no_memory_card_notification_message">Please insert memory card</string>
- <string name="usb_selection_notification_title">USB connection</string>
- <string name="usb_selection_notification_message">Select to manage your USB connection</string>
- <string name="usb_selection_notification_message_for_modem">Touch for details and to disconnect</string>
- <string name="usb_connection">USB connection</string>
- <string name="usb_mode_ngp">Portal &amp; tools</string>
- <string name="usb_mode_mtp">Windows media sync</string>
- <string name="usb_mode_msc">Memory card access</string>
- <string name="usb_mode_modem">Phone as modem</string>
- <string name="usb_mode_none">Charge only</string>
- <string name="usb_toast_insert_card">Please insert a memory card for your media.</string>
- <string name="usb_progress_message">Switching to</string>
- <string name="usb_error_message">The USB connection cannot change to</string>
-</resources>
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+ <string name="usb_toast_connecting">USB connected as %s.</string>
+ <string name="usb_toast_phone_data_disabled">Phone data will be disabled.</string>
+ <string name="usb_selection_notification_title">USB connection</string>
+ <string name="usb_selection_notification_message">Select to manage your USB connection</string>
+ <string name="usb_selection_notification_message_for_modem">Touch for details and to disconnect</string>
+ <string name="usb_connection">USB connection</string>
+ <string name="usb_mode_ngp">Portal &amp; tools</string>
+ <string name="usb_mode_mtp">Windows media sync</string>
+ <string name="usb_mode_msc">Memory card access</string>
+ <string name="usb_mode_modem">Phone as modem</string>
+ <string name="usb_mode_none">Charge only</string>
+</resources>
View
@@ -1,24 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
- <string name="usb_period">.</string>
- <string name="usb_ok">Aceptar</string>
- <string name="usb_cancel">Cancelar</string>
- <string name="usb_3_periods">...</string>
- <string name="usb_toast_connecting_to">Conectando para</string>
- <string name="usb_toast_phone_data_disabled">Los datos del teléfono se deshabilitarán.</string>
- <string name="usb_no_memory_card_notification_title">No se ha insertado ninguna tarjeta de memoria.</string>
- <string name="usb_no_memory_card_notification_message_title">Se ha perdido la tarjeta de memoria.</string>
- <string name="usb_no_memory_card_notification_message">Inserte la tarjeta de memoria</string>
- <string name="usb_selection_notification_title">Conexión USB</string>
- <string name="usb_selection_notification_message">Seleccionar para administrar la conexión USB</string>
- <string name="usb_selection_notification_message_for_modem">Toca para obtener más información y desconectar</string>
- <string name="usb_connection">Conexión USB</string>
- <string name="usb_mode_ngp">Portal y herramientas</string>
- <string name="usb_mode_mtp">Sincronización de Windows Media</string>
- <string name="usb_mode_msc">Acceso a tarjeta de memoria</string>
- <string name="usb_mode_modem">Teléfono como módem</string>
- <string name="usb_mode_none">Solo carga</string>
- <string name="usb_toast_insert_card">Introduce una tarjeta de memoria para los archivos multimedia.</string>
- <string name="usb_progress_message">Cambiando a</string>
- <string name="usb_error_message">La conexión USB no se puede cambiar a</string>
-</resources>
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+ <string name="usb_toast_phone_data_disabled">Los datos del teléfono se deshabilitarán.</string>
+ <string name="usb_selection_notification_title">Conexión USB</string>
+ <string name="usb_selection_notification_message">Seleccionar para administrar la conexión USB</string>
+ <string name="usb_selection_notification_message_for_modem">Toca para obtener más información y desconectar</string>
+ <string name="usb_connection">Conexión USB</string>
+ <string name="usb_mode_ngp">Portal y herramientas</string>
+ <string name="usb_mode_mtp">Sincronización de Windows Media</string>
+ <string name="usb_mode_msc">Acceso a tarjeta de memoria</string>
+ <string name="usb_mode_modem">Teléfono como módem</string>
+ <string name="usb_mode_none">Solo carga</string>
+</resources>
View
@@ -1,24 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
- <string name="usb_period">.</string>
- <string name="usb_ok">OK</string>
- <string name="usb_cancel">Annuler</string>
- <string name="usb_3_periods">...</string>
- <string name="usb_toast_connecting_to">Connexion pour</string>
- <string name="usb_toast_phone_data_disabled">Les données du téléphone vont être désactivées.</string>
- <string name="usb_no_memory_card_notification_title">Aucune carte mémoire insérée</string>
- <string name="usb_no_memory_card_notification_message_title">Carte mémoire manquante</string>
- <string name="usb_no_memory_card_notification_message">Insérez une carte mémoire</string>
- <string name="usb_selection_notification_title">Connexion USB</string>
- <string name="usb_selection_notification_message">Sélectionner pour gérer votre connexion USB</string>
- <string name="usb_selection_notification_message_for_modem">Touchez pour obtenir plus de détails et vous déconnecter</string>
- <string name="usb_connection">Connexion USB</string>
- <string name="usb_mode_ngp">Portail &amp; outils</string>
- <string name="usb_mode_mtp">Synchronisation Windows Media</string>
- <string name="usb_mode_msc">Accès à la carte mémoire</string>
- <string name="usb_mode_modem">Téléphone en tant que modem</string>
- <string name="usb_mode_none">Chargement uniquement</string>
- <string name="usb_toast_insert_card">Veuillez insérer une carte mémoire où stocker vos médias.</string>
- <string name="usb_progress_message">Passage à</string>
- <string name="usb_error_message">La connexion USB ne peut pas passer à</string>
-</resources>
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+ <string name="usb_toast_connecting">Connexion USB : %s</string>
+ <string name="usb_toast_phone_data_disabled">Les données du téléphone vont être désactivées.</string>
+ <string name="usb_selection_notification_title">Connexion USB</string>
+ <string name="usb_selection_notification_message">Sélectionner pour gérer votre connexion USB</string>
+ <string name="usb_selection_notification_message_for_modem">Touchez pour obtenir plus de détails et vous déconnecter</string>
+ <string name="usb_connection">Connexion USB</string>
+ <string name="usb_mode_ngp">Portail &amp; outils</string>
+ <string name="usb_mode_mtp">Synchronisation Windows Media</string>
+ <string name="usb_mode_msc">Accès à la carte mémoire</string>
+ <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>
+</resources>
View
@@ -1,24 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
- <string name="usb_period">.</string>
- <string name="usb_ok">OK</string>
- <string name="usb_cancel">Annulla</string>
- <string name="usb_3_periods">...</string>
- <string name="usb_toast_connecting_to">Connessione per</string>
- <string name="usb_toast_phone_data_disabled">I dati del telefono verranno disattivati.</string>
- <string name="usb_no_memory_card_notification_title">Nessuna scheda di memoria inserita</string>
- <string name="usb_no_memory_card_notification_message_title">Scheda di memoria mancante</string>
- <string name="usb_no_memory_card_notification_message">Inserisci scheda di memoria</string>
- <string name="usb_selection_notification_title">Connessione USB</string>
- <string name="usb_selection_notification_message">Seleziona per gestire connessione USB</string>
- <string name="usb_selection_notification_message_for_modem">Tocca per dettagli e per disconnettere</string>
- <string name="usb_connection">Connessione USB</string>
- <string name="usb_mode_ngp">Portale e strumenti</string>
- <string name="usb_mode_mtp">Sincronizzazione supporti Windows</string>
- <string name="usb_mode_msc">Accesso scheda di memoria</string>
- <string name="usb_mode_modem">Telefono come modem</string>
- <string name="usb_mode_none">Solo ricarica</string>
- <string name="usb_toast_insert_card">Inserisci la scheda di memoria e ricollega il cavo USB.</string>
- <string name="usb_progress_message">Passaggio a</string>
- <string name="usb_error_message">Impossibile modificare la connessione USB in</string>
-</resources>
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+ <string name="usb_toast_phone_data_disabled">I dati del telefono verranno disattivati.</string>
+ <string name="usb_selection_notification_title">Connessione USB</string>
+ <string name="usb_selection_notification_message">Seleziona per gestire connessione USB</string>
+ <string name="usb_selection_notification_message_for_modem">Tocca per dettagli e per disconnettere</string>
+ <string name="usb_connection">Connessione USB</string>
+ <string name="usb_mode_ngp">Portale e strumenti</string>
+ <string name="usb_mode_mtp">Sincronizzazione supporti Windows</string>
+ <string name="usb_mode_msc">Accesso scheda di memoria</string>
+ <string name="usb_mode_modem">Telefono come modem</string>
+ <string name="usb_mode_none">Solo ricarica</string>
+</resources>
Oops, something went wrong.

0 comments on commit c149fd0

Please sign in to comment.