diff options
53 files changed, 190 insertions, 272 deletions
diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java index 6d19f4174183..74b4fcbde0ef 100644 --- a/core/java/android/os/RecoverySystem.java +++ b/core/java/android/os/RecoverySystem.java @@ -16,6 +16,11 @@ package android.os; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.util.Log; + import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileNotFoundException; @@ -37,9 +42,6 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import android.content.Context; -import android.util.Log; - import org.apache.harmony.security.asn1.BerInputStream; import org.apache.harmony.security.pkcs7.ContentInfo; import org.apache.harmony.security.pkcs7.SignedData; @@ -336,8 +338,21 @@ public class RecoverySystem { * @throws IOException if writing the recovery command file * fails, or if the reboot itself fails. */ - public static void rebootWipeUserData(Context context) - throws IOException { + public static void rebootWipeUserData(Context context) throws IOException { + final ConditionVariable condition = new ConditionVariable(); + + Intent intent = new Intent("android.intent.action.MASTER_CLEAR_NOTIFICATION"); + context.sendOrderedBroadcast(intent, android.Manifest.permission.MASTER_CLEAR, + new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + condition.open(); + } + }, null, 0, null, null); + + // Block until the ordered broadcast has completed. + condition.block(); + bootCommand(context, "--wipe_data"); } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index c6ddb567ef37..c582eeef445b 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -55,6 +55,7 @@ <protected-broadcast android:name="android.intent.action.NEW_OUTGOING_CALL" /> <protected-broadcast android:name="android.intent.action.REBOOT" /> <protected-broadcast android:name="android.intent.action.DOCK_EVENT" /> + <protected-broadcast android:name="android.intent.action.MASTER_CLEAR_NOTIFICATION" /> <protected-broadcast android:name="android.app.action.ENTER_CAR_MODE" /> <protected-broadcast android:name="android.app.action.EXIT_CAR_MODE" /> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 360ff8daef91..fdc3679e70e0 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -896,7 +896,7 @@ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Dotaknite da biste saznali više o upotrebi mobilnih podataka"</string> <string name="throttled_notification_title" msgid="6269541897729781332">"Prekoračeno je ograničenje za podatke na mobilnom uređaju"</string> <string name="throttled_notification_message" msgid="4712369856601275146">"Dotaknite da biste saznali više o upotrebi mobilnih podataka"</string> - <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"Isključivanje memorije USB..."</string> + <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"Isključivanje USB memorije..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"Isključivanje SD kartice..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Brisanje memorije USB..."</string> <string name="progress_erasing" product="default" msgid="2115214724367534095">"Brisanje SD kartice..."</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index ab15a30d272b..90c2ab7f5193 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -400,7 +400,7 @@ <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"consenti ricezione multicast Wi-Fi"</string> <string name="permdesc_changeWifiMulticastState" msgid="8199464507656067553">"Consente a un\'applicazione di ricevere pacchetti non direttamente indirizzati al tuo dispositivo. Può essere utile durante la ricerca di servizi offerti nelle vicinanze. Consuma di più rispetto alla modalità non multicast."</string> <string name="permlab_accessWimaxState" msgid="2800410363171809280">"visualizzazione stato WiMAX"</string> - <string name="permdesc_accessWimaxState" msgid="8298035866227524023">"Consente a un\'applicazione di visualizzare le informazioni relative allo stato della connessione WiMAX."</string> + <string name="permdesc_accessWimaxState" msgid="8298035866227524023">"Consente a un\'applicazione di visualizzare le informazioni relative allo stato della rete WiMAX."</string> <string name="permlab_changeWimaxState" msgid="340465839241528618">"modifica stato WiMAX"</string> <string name="permdesc_changeWimaxState" msgid="474918005058989421">"Consente a un\'applicazione di connettersi/disconnettersi dalla rete WiMAX."</string> <string name="permlab_bluetoothAdmin" msgid="1092209628459341292">"gestione Bluetooth"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 0b10d526ebef..a70bcbff3208 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -241,8 +241,8 @@ <string name="permdesc_injectEvents" msgid="3946098050410874715">"Pozwala aplikacjom na dostarczanie własnych zdarzeń wprowadzania danych (naciśnięcie klawisza itp.) do innych aplikacji. Szkodliwe aplikacje mogą to wykorzystać do przejęcia kontroli nad telefonem."</string> <string name="permlab_readInputState" msgid="469428900041249234">"zapamiętywanie wpisywanych znaków oraz wykonywanych czynności"</string> <string name="permdesc_readInputState" msgid="5132879321450325445">"Pozwala aplikacjom na śledzenie naciskanych klawiszy, nawet podczas pracy z innym programem (na przykład podczas wpisywania hasła). Nigdy nie powinno być potrzebne normalnym aplikacjom."</string> - <string name="permlab_bindInputMethod" msgid="3360064620230515776">"tworzenie powiązania z metodą wejściową"</string> - <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Pozwala na tworzenie powiązania z interfejsem najwyższego poziomu metody wejściowej. To uprawnienie nie powinno być nigdy wymagane przez zwykłe aplikacje."</string> + <string name="permlab_bindInputMethod" msgid="3360064620230515776">"powiązanie ze sposobem wprowadzania tekstu"</string> + <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Pozwala na powiązanie wybranego sposobu wprowadzania tekstu z interfejsem najwyższego poziomu. To uprawnienie nie powinno być nigdy wymagane przez zwykłe aplikacje."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"powiązanie z tapetą"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Umożliwia posiadaczowi powiązać interfejs najwyższego poziomu dla tapety. Nie powinno być nigdy potrzebne w przypadku zwykłych aplikacji."</string> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interakcja z administratorem urządzenia"</string> @@ -721,7 +721,7 @@ <string name="copy" msgid="2681946229533511987">"Kopiuj"</string> <string name="paste" msgid="5629880836805036433">"Wklej"</string> <string name="copyUrl" msgid="2538211579596067402">"Kopiuj adres URL"</string> - <string name="inputMethod" msgid="1653630062304567879">"Metoda wprowadzania"</string> + <string name="inputMethod" msgid="1653630062304567879">"Sposób wprowadzania tekstu"</string> <string name="addToDictionary" msgid="8793624991686948709">"Dodaj termin „<xliff:g id="WORD">%s</xliff:g>” do słownika"</string> <string name="editTextMenuTitle" msgid="1672989176958581452">"Edytuj tekst"</string> <string name="low_internal_storage_view_title" msgid="1399732408701697546">"Mało miejsca"</string> @@ -824,7 +824,7 @@ <string name="extmedia_format_button_format" msgid="4131064560127478695">"Formatuj"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"Podłączono moduł debugowania USB"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Wybierz, aby wyłączyć debugowanie USB."</string> - <string name="select_input_method" msgid="6865512749462072765">"Wybierz metodę wprowadzania"</string> + <string name="select_input_method" msgid="6865512749462072765">"Wybierz sposób wprowadzania tekstu"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" AĄBCĆDEĘFGHIJKLŁMNŃOÓPQRSŚTUVWXYZŹŻ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandydaci"</u></string> @@ -875,7 +875,7 @@ <string name="deny" msgid="2081879885755434506">"Odmów"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Żądane pozwolenie"</string> <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Prośba o pozwolenie"\n"dotyczące konta <xliff:g id="ACCOUNT">%s</xliff:g>"</string> - <string name="input_method_binding_label" msgid="1283557179944992649">"Metoda wprowadzania"</string> + <string name="input_method_binding_label" msgid="1283557179944992649">"Sposób wprowadzania tekstu"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Synchronizacja"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Ułatwienia dostępu"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Tapeta"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 570bafffaa59..7b50b2e598f3 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -402,7 +402,7 @@ <string name="permlab_accessWimaxState" msgid="2800410363171809280">"vizualizaţi starea WiMAX"</string> <string name="permdesc_accessWimaxState" msgid="8298035866227524023">"Permite unei aplicaţii să vizualizeze informaţiile despre starea WiMAX."</string> <string name="permlab_changeWimaxState" msgid="340465839241528618">"schimbaţi starea WiMAX"</string> - <string name="permdesc_changeWimaxState" msgid="474918005058989421">"Permite unei aplicaţii să se conecteze la şi să se deconecteze de la reţeaua WiMAX."</string> + <string name="permdesc_changeWimaxState" msgid="474918005058989421">"Permite unei aplicaţii să se conecteze şi să se deconecteze de la reţeaua WiMAX."</string> <string name="permlab_bluetoothAdmin" msgid="1092209628459341292">"administrare bluetooth"</string> <string name="permdesc_bluetoothAdmin" msgid="7256289774667054555">"Permite unei aplicaţii să configureze telefonul Bluetooth local, să descopere şi să se asocieze cu dispozitive la distanţă."</string> <string name="permlab_bluetooth" msgid="8361038707857018732">"creare conexiuni Bluetooth"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index bcb4c9fecd75..447c856e9188 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -379,7 +379,7 @@ <string name="permdesc_authenticateAccounts" msgid="4006839406474208874">"Разрешает приложению использовать возможности аутентификации диспетчера аккаунта, в том числе создавать аккаунты, получать и устанавливать пароли для них."</string> <string name="permlab_manageAccounts" msgid="4440380488312204365">"управление списком аккаунтов"</string> <string name="permdesc_manageAccounts" msgid="8804114016661104517">"Разрешает приложению добавлять и удалять аккаунты и стирать их пароли."</string> - <string name="permlab_useCredentials" msgid="6401886092818819856">"использование регистрационных данных аккаунта для аутентификации"</string> + <string name="permlab_useCredentials" msgid="6401886092818819856">"использование учетных данных аккаунта для аутентификации"</string> <string name="permdesc_useCredentials" msgid="7416570544619546974">"Разрешает приложению запрашивать маркеры аутентификации."</string> <string name="permlab_accessNetworkState" msgid="6865575199464405769">"просматривать состояние сети"</string> <string name="permdesc_accessNetworkState" msgid="558721128707712766">"Позволяет приложению просматривать состояние всех сетей."</string> @@ -399,7 +399,7 @@ <string name="permdesc_changeWifiState" msgid="2950383153656873267">"Позволяет приложению подключаться к точкам доступа Wi-Fi и отключаться от них, а также вносить изменения в конфигурацию сетей Wi-Fi."</string> <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"разрешить принимать многоадресный сигнал Wi-Fi"</string> <string name="permdesc_changeWifiMulticastState" msgid="8199464507656067553">"Разрешает приложению получать пакеты, не адресованные напрямую вашему устройству. Это может быть полезно при поиске находящихся рядом служб. Расход заряда батареи при этом выше, чем при одноадресной передаче."</string> - <string name="permlab_accessWimaxState" msgid="2800410363171809280">"получать состояние WiMAX"</string> + <string name="permlab_accessWimaxState" msgid="2800410363171809280">"получать сведения о состоянии WiMAX"</string> <string name="permdesc_accessWimaxState" msgid="8298035866227524023">"Позволяет приложению получать сведения о состоянии WiMAX."</string> <string name="permlab_changeWimaxState" msgid="340465839241528618">"изменять состояние WiMAX"</string> <string name="permdesc_changeWimaxState" msgid="474918005058989421">"Позволяет приложению подключаться к сети WiMAX и отключаться от нее."</string> @@ -425,7 +425,7 @@ <string name="permdesc_readDictionary" msgid="1082972603576360690">"Позволяет приложению считывать любые слова, имена и фразы личного пользования, которые могут храниться в пользовательском словаре."</string> <string name="permlab_writeDictionary" msgid="6703109511836343341">"записывать в словарь пользователя"</string> <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Позволяет приложению записывать новые слова в словарь пользователя."</string> - <string name="permlab_sdcardWrite" product="nosdcard" msgid="85430876310764752">"изменять и удалять содержимое USB-накопителя"</string> + <string name="permlab_sdcardWrite" product="nosdcard" msgid="85430876310764752">"изм./удал. содерж. накопителя"</string> <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"изменять/удалять содержимое SD-карты"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Разрешает приложению запись на USB-накопитель."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Разрешает приложению запись на SD-карту"</string> @@ -748,7 +748,7 @@ <string name="anr_application_process" msgid="4185842666452210193">"Приложение <xliff:g id="APPLICATION">%1$s</xliff:g> (в процессе <xliff:g id="PROCESS">%2$s</xliff:g>) не отвечает."</string> <string name="anr_process" msgid="1246866008169975783">"Процесс <xliff:g id="PROCESS">%1$s</xliff:g> не отвечает."</string> <string name="force_close" msgid="3653416315450806396">"Закрыть"</string> - <string name="report" msgid="4060218260984795706">"Отчет"</string> + <string name="report" msgid="4060218260984795706">"Отзыв"</string> <string name="wait" msgid="7147118217226317732">"Подождать"</string> <string name="launch_warning_title" msgid="8323761616052121936">"Приложение перенаправлено"</string> <string name="launch_warning_replace" msgid="6202498949970281412">"Приложение <xliff:g id="APP_NAME">%1$s</xliff:g> выполняется."</string> @@ -839,7 +839,7 @@ <string name="ext_media_unmountable_notification_title" product="default" msgid="6410723906019100189">"Поврежденная карта SD"</string> <string name="ext_media_unmountable_notification_message" product="nosdcard" msgid="529021299294450667">"USB-накопитель поврежден. Попробуйте отформатировать его."</string> <string name="ext_media_unmountable_notification_message" product="default" msgid="6902531775948238989">"SD-карта повреждена. Попробуйте отформатировать ее."</string> - <string name="ext_media_badremoval_notification_title" product="nosdcard" msgid="1661683031330951073">"USB-накопитель неожиданно отключен"</string> + <string name="ext_media_badremoval_notification_title" product="nosdcard" msgid="1661683031330951073">"Накопитель неожиданно отключен"</string> <string name="ext_media_badremoval_notification_title" product="default" msgid="6872152882604407837">"Карта SD неожиданно извлечена"</string> <string name="ext_media_badremoval_notification_message" product="nosdcard" msgid="4329848819865594241">"Перед извлечением USB-накопителя отключите его во избежание потери данных."</string> <string name="ext_media_badremoval_notification_message" product="default" msgid="7260183293747448241">"Перед извлечением карты SD отключите ее во избежание потери данных."</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index fe08220698f5..a783f0bba74d 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -399,11 +399,9 @@ <string name="permdesc_changeWifiState" msgid="2950383153656873267">"Umožňuje aplikácii pripojiť sa k prístupovým bodom Wi-Fi alebo sa od nich odpojiť a uskutočňovať zmeny nakonfigurovaných sietí Wi-Fi."</string> <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"Povoliť príjem viacsmerového vysielania Wi-Fi"</string> <string name="permdesc_changeWifiMulticastState" msgid="8199464507656067553">"Umožňuje aplikácii prijímať pakety, ktoré neboli adresované priamo vášmu zariadeniu. Pomocou tejto možnosti môžete objaviť služby ponúkané vo vašej blízkosti. Spotreba energie je vyššia ako v režime bez viacsmerového vysielania."</string> - <!-- no translation found for permlab_accessWimaxState (2800410363171809280) --> - <skip /> + <string name="permlab_accessWimaxState" msgid="2800410363171809280">"zobraziť stav WiMAX"</string> <string name="permdesc_accessWimaxState" msgid="8298035866227524023">"Umožňuje aplikácii zobraziť informácie o stave siete WiMAX."</string> - <!-- no translation found for permlab_changeWimaxState (340465839241528618) --> - <skip /> + <string name="permlab_changeWimaxState" msgid="340465839241528618">"zmeniť stav WiMAX"</string> <string name="permdesc_changeWimaxState" msgid="474918005058989421">"Umožňuje aplikácii pripojiť sa a odpojiť zo siete WiMAX."</string> <string name="permlab_bluetoothAdmin" msgid="1092209628459341292">"správa rozhrania Bluetooth"</string> <string name="permdesc_bluetoothAdmin" msgid="7256289774667054555">"Umožňuje aplikácii konfigurovať miestny telefón s rozhraním Bluetooth a vyhľadávať a párovať vzdialené zariadenia."</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 108fdf58c60d..767744e7fde6 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -399,9 +399,9 @@ <string name="permdesc_changeWifiState" msgid="2950383153656873267">"Омогућава да се апликација повезује са Wi-Fi приступним тачкама и да прекине везу са њима, као и да уноси промене у конфигурисане Wi-Fi мреже."</string> <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"омогућавање пријема вишесмерног Wi-Fi саобраћаја"</string> <string name="permdesc_changeWifiMulticastState" msgid="8199464507656067553">"Омогућава да апликација прима пакете који нису директно намењени вашем уређају. То може бити корисно при откривању услуга које се нуде у вашој близини. Користи више напајања од режима једносмерног саобраћаја."</string> - <string name="permlab_accessWimaxState" msgid="2800410363171809280">"преглед WiMAX статуса"</string> + <string name="permlab_accessWimaxState" msgid="2800410363171809280">"прикажи WiMAX статуса"</string> <string name="permdesc_accessWimaxState" msgid="8298035866227524023">"Омогућава апликацији преглед информација о WiMAX статусу."</string> - <string name="permlab_changeWimaxState" msgid="340465839241528618">"промена WiMAX статуса"</string> + <string name="permlab_changeWimaxState" msgid="340465839241528618">"промени WiMAX статуса"</string> <string name="permdesc_changeWimaxState" msgid="474918005058989421">"Омогућава апликацији повезивање и прекид везе са WiMAX мрежом."</string> <string name="permlab_bluetoothAdmin" msgid="1092209628459341292">"администрирање преко bluetooth-а"</string> <string name="permdesc_bluetoothAdmin" msgid="7256289774667054555">"Омогућава да апликација конфигурише локални Bluetooth телефон, као и да открије удаљене уређаје и упари се са њима."</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 0a5b6aa4bcb5..e41112b9c7ba 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -817,7 +817,7 @@ <string name="dlg_confirm_kill_storage_users_text" msgid="3202838234780505886">"USB depolama birimini açarsanız, kullanmakta olduğunuz bazı uygulamalar durur ve USB depolama birimi kapatılıncaya kadar kullanılamayabilir."</string> <string name="dlg_error_title" msgid="8048999973837339174">"USB işlemi başarısız oldu"</string> <string name="dlg_ok" msgid="7376953167039865701">"Tamam"</string> - <string name="extmedia_format_title" product="nosdcard" msgid="7980995592595097841">"USB dep br biçimlndr"</string> + <string name="extmedia_format_title" product="nosdcard" msgid="7980995592595097841">"USB\'yi biçimlendir"</string> <string name="extmedia_format_title" product="default" msgid="8663247929551095854">"SD kartı biçimlendir"</string> <string name="extmedia_format_message" product="nosdcard" msgid="8296908079722897772">"USB depolama birimi biçimlendirilsin mi? Depolama biriminde saklanan tüm dosyalar silinir. İşlem geri alınamaz!"</string> <string name="extmedia_format_message" product="default" msgid="3621369962433523619">"SD kartı biçimlendirmek istediğinizden emin misiniz? Kartınızdaki tüm veriler yok olacak."</string> diff --git a/docs/html/guide/market/billing/billing_integrate.jd b/docs/html/guide/market/billing/billing_integrate.jd index 0f081a58dafc..6e40f3297555 100755 --- a/docs/html/guide/market/billing/billing_integrate.jd +++ b/docs/html/guide/market/billing/billing_integrate.jd @@ -223,7 +223,7 @@ Billing package contains the sample application and the AIDL file. </div> <pre> try { boolean bindResult = mContext.bindService( - new Intent(IMarketBillingService.class.getName()), this, Context.BIND_AUTO_CREATE); + new Intent("com.android.vending.billing.MarketBillingService.BIND"), this, Context.BIND_AUTO_CREATE); if (bindResult) { Log.i(TAG, "Service bind successful."); } else { diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 1980780f49ba..92aee43d1fca 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"ملحق USB"</string> + <string name="label_view" msgid="6304565553218192990">"عرض"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"الاستخدام بشكل افتراضي لملحق USB هذا"</string> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index ecbd0a8508ca..fb72e708c0b6 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Аксесоар за USB"</string> + <string name="label_view" msgid="6304565553218192990">"Преглед"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Използване по подразб. за този аксесоар за USB"</string> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 6027969c5f69..d9cb0ca2efac 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Accessori USB"</string> + <string name="label_view" msgid="6304565553218192990">"Mostra"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Utilitza de manera predet. per a l\'accessori USB"</string> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index f47da01319de..6962425822a2 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Periferní zařízení USB"</string> + <string name="label_view" msgid="6304565553218192990">"Zobrazit"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Pro toto periferní zařízení USB použít jako výchozí"</string> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index dc1d4510316b..015c12926605 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB-ekstraudstyr"</string> + <string name="label_view" msgid="6304565553218192990">"Vis"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Brug som standard til dette USB-tilbehør"</string> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 791d3cdcd547..744b874920f9 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB-Zubehör"</string> + <string name="label_view" msgid="6304565553218192990">"Anzeigen"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Standardmäßig für dieses USB-Zubehör verwenden"</string> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index f7d72e3f5ad7..8eb55241ab5d 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Αξεσουάρ USB"</string> + <string name="label_view" msgid="6304565553218192990">"Προβολή"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Χρήση από προεπιλογή για αυτό το εξάρτημα USB"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 6d872492ea71..9a30cd230cd2 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB accessory"</string> + <string name="label_view" msgid="6304565553218192990">"View"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Use by default for this USB accessory"</string> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 00641e8b3b04..a0669b17a7a5 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Accesorio USB"</string> + <string name="label_view" msgid="6304565553218192990">"Ver"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Se usa de forma predeterminada para este accesorio USB."</string> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 576d22f6c3f3..1eab5c30f7b4 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Accesorio USB"</string> + <string name="label_view" msgid="6304565553218192990">"Ver"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Usar de forma predeterminada para este accesorio USB"</string> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 07b2d5ff9d63..7ae4171150bc 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"لوازم جانبی USB"</string> + <string name="label_view" msgid="6304565553218192990">"مشاهده"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"استفاده به صورت پیش فرض برای این دستگاه USB"</string> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 14ba9e9f72bd..52feb4d04181 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB-lisälaite"</string> + <string name="label_view" msgid="6304565553218192990">"Näytä"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Käytä oletuksena tällä USB-lisälaitteella"</string> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 57f102e36aef..ed1e3936ffb0 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Accessoire USB"</string> + <string name="label_view" msgid="6304565553218192990">"Afficher"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Utiliser par défaut pour cet accessoire USB"</string> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 105f36710ace..9256f83f8254 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB pribor"</string> + <string name="label_view" msgid="6304565553218192990">"Prikaži"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Koristi se prema zadanim postavkama za ovaj USB pribor"</string> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index a88ca39bac59..f018f1fcc567 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB-kellék"</string> + <string name="label_view" msgid="6304565553218192990">"Megtekintés"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Alapértelmezett használat ehhez az USB-kiegészítőhöz"</string> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 6cd09e2d1348..128d58d60675 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Aksesori USB"</string> + <string name="label_view" msgid="6304565553218192990">"Lihat"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Gunakan secara bawaan untuk aksesori USB ini"</string> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index b3a90182ffc0..db31a4be570c 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Accessorio USB"</string> + <string name="label_view" msgid="6304565553218192990">"Visualizza"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Usa per impostazione predef. per accessorio USB"</string> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 9934e0fbabbb..5393e02c0822 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"עזרי USB"</string> + <string name="label_view" msgid="6304565553218192990">"הצג"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"השתמש כברירת מחדל עבור אביזר USB זה"</string> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 7653a50969d3..74910a91e24c 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USBアクセサリ"</string> + <string name="label_view" msgid="6304565553218192990">"表示"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"このUSBアクセサリにデフォルトで使用する"</string> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 50f13688efde..2592c9faf07c 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB 액세서리"</string> + <string name="label_view" msgid="6304565553218192990">"보기"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"이 USB 액세서리에 기본값으로 사용"</string> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index af62efc22ac7..5c75737e29b6 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB reikmuo"</string> + <string name="label_view" msgid="6304565553218192990">"Žiūrėti"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Šiam USB priedui naudoti pagal numat. nustatymus"</string> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 730edfe90a05..5b9578af70f8 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB piederums"</string> + <string name="label_view" msgid="6304565553218192990">"Skatīt"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Pēc noklusējuma izmantot šim USB piederumam"</string> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 1d8761037998..744b381040a6 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB-enhet"</string> + <string name="label_view" msgid="6304565553218192990">"Vis"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Bruk som standard for dette USB-tilbehøret"</string> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index aec275b7a04b..c5be3bb097a4 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB-accessoire"</string> + <string name="label_view" msgid="6304565553218192990">"Weergeven"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Standaard gebruiken voor dit USB-accessoire"</string> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 69c23aa2f549..177acd6b4c05 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Akcesorium USB"</string> + <string name="label_view" msgid="6304565553218192990">"Wyświetl"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Używaj domyślnie dla tego akcesorium USB"</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 0f3ca08ce8cd..e89a243629b9 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Acessório USB"</string> + <string name="label_view" msgid="6304565553218192990">"Ver"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Utilizar por predefinição para este acessório USB"</string> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 55115502a6c6..d6e7553b303f 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Acessório USB"</string> + <string name="label_view" msgid="6304565553218192990">"Visualizar"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Usar por padrão para este acessório USB"</string> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index ff27daaa52a1..d7b82ccef6a1 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Accesoriu USB"</string> + <string name="label_view" msgid="6304565553218192990">"Afişaţi"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Utiliz. în mod prestabilit pt. acest accesoriu USB"</string> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index bcaf32817461..f1570d2a0b1e 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB-устройство"</string> + <string name="label_view" msgid="6304565553218192990">"Просмотр"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Использовать по умолчанию для этого USB-аксессуара"</string> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 40c7ce435917..da0a99802cef 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Periférne zariadenie USB"</string> + <string name="label_view" msgid="6304565553218192990">"Zobraziť"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Pre toto periférne zar. USB použiť ako predvolené"</string> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index da103b92a7a0..19787ba92f6f 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Dodatek USB"</string> + <string name="label_view" msgid="6304565553218192990">"Prikaži"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Privzeto uporabi za ta dodatek USB"</string> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index b9e13a2bd20e..37c2dbfdb40a 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB помоћни уређај"</string> + <string name="label_view" msgid="6304565553218192990">"Прикажи"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Користи подразумевано за овај USB додатак"</string> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 9fbe88638ac1..2786a4ed60ca 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB-tillbehör"</string> + <string name="label_view" msgid="6304565553218192990">"Visa"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Använd som standard för det här USB-tillbehöret"</string> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 5c30a49fbe2c..2949266015e1 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"อุปกรณ์เสริม USB"</string> + <string name="label_view" msgid="6304565553218192990">"ดู"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"ใช้ค่าเริ่มต้นสำหรับอุปกรณ์เสริม USB นี้"</string> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 8eade8118793..e141dc2055f2 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB accessory"</string> + <string name="label_view" msgid="6304565553218192990">"Tingnan"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Gamitin bilang default sa USB accessory na ito"</string> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index aeff397df404..05b628f09247 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB aksesuarı"</string> + <string name="label_view" msgid="6304565553218192990">"Görüntüle"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Bu USB aksesuar için varsayılan olarak kullan"</string> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 3fea0ddf1cf0..b12934ea9b95 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Пристрій USB"</string> + <string name="label_view" msgid="6304565553218192990">"Переглянути"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Використовувати за умовчанням для аксесуара USB"</string> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 02f336c57b59..469fd613f914 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"Phụ kiện USB"</string> + <string name="label_view" msgid="6304565553218192990">"Xem"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Sử dụng theo mặc định cho phụ kiện USB này"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 59f13c71a906..85eed513eaf9 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB 配件"</string> + <string name="label_view" msgid="6304565553218192990">"查看"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"默认情况下用于该 USB 配件"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 793527fc7749..0c0ff48b9b62 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -36,10 +36,7 @@ <skip /> <!-- no translation found for usb_accessory_uri_prompt (6332150684964235705) --> <skip /> - <!-- no translation found for title_usb_accessory (4966265263465181372) --> - <skip /> - <!-- no translation found for label_view (6304565553218192990) --> - <skip /> - <!-- no translation found for always_use_accessory (1210954576979621596) --> - <skip /> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB 配件"</string> + <string name="label_view" msgid="6304565553218192990">"查看"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"預設用於這個 USB 配件"</string> </resources> diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 8f0816d5097c..8c4bf18ab95b 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -391,6 +391,10 @@ public class ConnectivityService extends IConnectivityManager.Stub { nst.startMonitoring(); } mNetTrackers[netType] = nst; + if (noMobileData) { + if (DBG) Slog.d(TAG, "tearing down WiMAX networks due to setting"); + mNetTrackers[netType].teardown(); + } break; default: Slog.e(TAG, "Trying to create a DataStateTracker for an unknown radio type " + @@ -987,6 +991,12 @@ public class ConnectivityService extends IConnectivityManager.Stub { } mNetTrackers[ConnectivityManager.TYPE_MOBILE].reconnect(); } + if (mNetTrackers[ConnectivityManager.TYPE_WIMAX] != null) { + if (DBG) { + Slog.d(TAG, "starting up " + mNetTrackers[ConnectivityManager.TYPE_WIMAX]); + } + mNetTrackers[ConnectivityManager.TYPE_WIMAX].reconnect(); + } } else { for (NetworkStateTracker nt : mNetTrackers) { if (nt == null) continue; @@ -996,6 +1006,9 @@ public class ConnectivityService extends IConnectivityManager.Stub { nt.teardown(); } } + if (mNetTrackers[ConnectivityManager.TYPE_WIMAX] != null) { + mNetTrackers[ConnectivityManager.TYPE_WIMAX].teardown(); + } } } @@ -1124,6 +1137,12 @@ public class ConnectivityService extends IConnectivityManager.Stub { " because Mobile Data Disabled"); continue; } + if (mNetAttributes[checkType].mRadio == ConnectivityManager.TYPE_WIMAX && + noMobileData) { + Slog.e(TAG, "not failing over to mobile type " + checkType + + " because Mobile Data Disabled"); + continue; + } NetworkStateTracker checkTracker = mNetTrackers[checkType]; NetworkInfo checkInfo = checkTracker.getNetworkInfo(); if (!checkInfo.isConnectedOrConnecting() || checkTracker.isTeardownRequested()) { diff --git a/services/java/com/android/server/usb/UsbService.java b/services/java/com/android/server/usb/UsbService.java index f366e1095098..b4789e732629 100644 --- a/services/java/com/android/server/usb/UsbService.java +++ b/services/java/com/android/server/usb/UsbService.java @@ -387,11 +387,14 @@ public class UsbService extends IUsbManager.Stub { case MSG_UPDATE_STATE: if (mConnected != mLastConnected || mConfiguration != mLastConfiguration) { if (mConnected == 0) { - // make sure accessory mode is off, and restore default functions - if (mCurrentAccessory != null && UsbManager.setFunctionEnabled( - UsbManager.USB_FUNCTION_ACCESSORY, false)) { + if (UsbManager.isFunctionEnabled( + UsbManager.USB_FUNCTION_ACCESSORY)) { + // make sure accessory mode is off, and restore default functions Log.d(TAG, "exited USB accessory mode"); - + if (!UsbManager.setFunctionEnabled + (UsbManager.USB_FUNCTION_ACCESSORY, false)) { + Log.e(TAG, "could not disable accessory function"); + } int count = mDefaultFunctions.size(); for (int i = 0; i < count; i++) { String function = mDefaultFunctions.get(i); @@ -400,8 +403,10 @@ public class UsbService extends IUsbManager.Stub { } } - mDeviceManager.accessoryDetached(mCurrentAccessory); - mCurrentAccessory = null; + if (mCurrentAccessory != null) { + mDeviceManager.accessoryDetached(mCurrentAccessory); + mCurrentAccessory = null; + } } } |