diff options
author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:26:21 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:26:21 -0800 |
commit | d33287d23af5e2b5c1e699e0bad627669f1102bf (patch) | |
tree | 4535c235deb92f1aa78933714d2e96e856e45661 | |
parent | 65e4ac5d30b316328ebbeb0589809ca2a84e2b3d (diff) | |
parent | 59af846139224607b667c61ee191bf363ef929ba (diff) | |
download | packages_providers_ContactsProvider-d33287d23af5e2b5c1e699e0bad627669f1102bf.zip packages_providers_ContactsProvider-d33287d23af5e2b5c1e699e0bad627669f1102bf.tar.gz packages_providers_ContactsProvider-d33287d23af5e2b5c1e699e0bad627669f1102bf.tar.bz2 |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/providers/ContactsProvider into cm-13.0
Android 6.0.1 release 22
-rw-r--r-- | res/values-az-rAZ/strings.xml | 3 | ||||
-rw-r--r-- | res/values-gu-rIN/strings.xml | 2 | ||||
-rw-r--r-- | res/values-ml-rIN/strings.xml | 4 | ||||
-rw-r--r-- | res/values-nb/strings.xml | 2 | ||||
-rw-r--r-- | res/values-nl/strings.xml | 4 | ||||
-rw-r--r-- | res/values-pt-rBR/strings.xml | 35 | ||||
-rw-r--r-- | res/values-ro/strings.xml | 6 | ||||
-rw-r--r-- | res/values-sr/strings.xml | 2 | ||||
-rw-r--r-- | res/values-uz-rUZ/strings.xml | 2 | ||||
-rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 1 |
10 files changed, 15 insertions, 46 deletions
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml index 23c0885..d11f636 100644 --- a/res/values-az-rAZ/strings.xml +++ b/res/values-az-rAZ/strings.xml @@ -19,11 +19,14 @@ <string name="sharedUserLabel" msgid="8024311725474286801">"Android Core Apps"</string> <string name="app_label" msgid="3389954322874982620">"Kontakt Yaddaşı"</string> <string name="provider_label" msgid="6012150850819899907">"Kontaktlar"</string> + <string name="upgrade_msg" msgid="8640807392794309950">"Kontakt data bazası təkmilləşdirilir."</string> <string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"Kontakt təkmilləşdirməsi əlavə yaddaş tələb edir."</string> <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"Kontakt üçün yaddaş təkmilləşdirilir."</string> <string name="upgrade_out_of_memory_notification_text" msgid="8438179450336437626">"Təkmilləşdirməni tamamlamaq üçün toxunun."</string> <string name="default_directory" msgid="93961630309570294">"Kontaktlar"</string> <string name="local_invisible_directory" msgid="705244318477396120">"Digər"</string> + <string name="read_write_all_voicemail_label" msgid="4557216100818257560">"Bütün səsli məktublara giriş"</string> + <string name="read_write_all_voicemail_description" msgid="8029809937805761356">"Tətbiqə bu cihazın giriş əldə edə biləcəyi bütün səsli məktubları saxlamağa və əldə etməyə imkan verir."</string> <string name="voicemail_from_column" msgid="435732568832121444">"Səsli mesaj göndərən: "</string> <string name="debug_dump_title" msgid="4916885724165570279">"Kontakt data bazasını kopyalayın"</string> <string name="debug_dump_database_message" msgid="406438635002392290">"Siz 1) informasiyaya və daxili yaddaş ehtiyatındakı zəng jurnalına bağlı data bazanızın nüsxəsini hazırlamaq 2) və onu e-poçt ilə göndərmək üzrəsiniz. Onu cihazdan kənarda və ya alınmış e-məktubda uğurla kopyalayandan sonra nüsxəsini silməyi unutmayın."</string> diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml index 16cd70b..7f58e0c 100644 --- a/res/values-gu-rIN/strings.xml +++ b/res/values-gu-rIN/strings.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="sharedUserLabel" msgid="8024311725474286801">"Android Core એપ્લિકેશનો"</string> + <string name="sharedUserLabel" msgid="8024311725474286801">"Android Core એપ્લિકેશન્સ"</string> <string name="app_label" msgid="3389954322874982620">"સંપર્કો સ્ટોરેજ"</string> <string name="provider_label" msgid="6012150850819899907">"સંપર્કો"</string> <string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"સંપર્કો અપગ્રેડને વધુ મેમરીની જરૂર છે."</string> diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index a3aa6d1..5493e4b 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -17,10 +17,10 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="sharedUserLabel" msgid="8024311725474286801">"Android കോർ അപ്ലിക്കേഷനുകൾ"</string> - <string name="app_label" msgid="3389954322874982620">"കോൺടാക്റ്റുകളുടെ സ്റ്റോറേജ്"</string> + <string name="app_label" msgid="3389954322874982620">"കോൺടാക്റ്റുകളുടെ സംഭരണം"</string> <string name="provider_label" msgid="6012150850819899907">"വിലാസങ്ങൾ"</string> <string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"കോൺടാക്റ്റുകൾ അപ്ഗ്രേഡുചെയ്യാൻ കൂടുതൽ മെമ്മറി ആവശ്യമാണ്."</string> - <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"കോൺടാക്റ്റുകൾക്കായുള്ള സ്റ്റോറേജ് അപ്ഗ്രേഡുചെയ്യുന്നു"</string> + <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"കോൺടാക്റ്റുകൾക്കായുള്ള സംഭരണം അപ്ഗ്രേഡുചെയ്യുന്നു"</string> <string name="upgrade_out_of_memory_notification_text" msgid="8438179450336437626">"അപ്ഗ്രേഡ് പൂർത്തിയാക്കാൻ സ്പർശിക്കുക."</string> <string name="default_directory" msgid="93961630309570294">"വിലാസങ്ങൾ"</string> <string name="local_invisible_directory" msgid="705244318477396120">"മറ്റുള്ളവ"</string> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 1cf97fd..6669a21 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -23,7 +23,7 @@ <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"Oppgraderer lagring for kontakter"</string> <string name="upgrade_out_of_memory_notification_text" msgid="8438179450336437626">"Trykk for å fullføre oppgraderingen."</string> <string name="default_directory" msgid="93961630309570294">"Kontakter"</string> - <string name="local_invisible_directory" msgid="705244318477396120">"Annet"</string> + <string name="local_invisible_directory" msgid="705244318477396120">"Andre"</string> <string name="voicemail_from_column" msgid="435732568832121444">"Talemelding fra "</string> <string name="debug_dump_title" msgid="4916885724165570279">"Kopiér kontaktdatabasen"</string> <string name="debug_dump_database_message" msgid="406438635002392290">"Du er i ferd med å 1) lage en kopi av databasen som omfatter all kontaktrelatert informasjon og alle anropslogger til den interne lagringsplassen, og 2) sende kopien med e-post. Husk å slette kopien så snart du har kopiert den fra enheten eller når e-posten er mottatt."</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 0cfeff5..73ea1a9 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -26,10 +26,10 @@ <string name="local_invisible_directory" msgid="705244318477396120">"Overig"</string> <string name="voicemail_from_column" msgid="435732568832121444">"Voicemail van "</string> <string name="debug_dump_title" msgid="4916885724165570279">"Contactendatabase kopiëren"</string> - <string name="debug_dump_database_message" msgid="406438635002392290">"Je staat op het punt 1) een kopie van je database met alle contactgegevens en oproeplogboeken te maken in de interne opslag, en 2) deze te e-mailen. Verwijder de kopie zodra je deze van het apparaat hebt gekopieerd of de e-mail is ontvangen."</string> + <string name="debug_dump_database_message" msgid="406438635002392290">"U staat op het punt 1) een kopie van uw database met alle contactgegevens en oproeplogboeken te maken in de interne opslag, en 2) deze te e-mailen. Verwijder de kopie zodra u deze van het apparaat heeft gekopieerd of de e-mail is ontvangen."</string> <string name="debug_dump_delete_button" msgid="7832879421132026435">"Nu verwijderen"</string> <string name="debug_dump_start_button" msgid="2837506913757600001">"Starten"</string> - <string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"Selecteer een programma om je bestand te verzenden"</string> + <string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"Selecteer een programma om uw bestand te verzenden"</string> <string name="debug_dump_email_subject" msgid="108188398416385976">"Contactendatabase bijgevoegd"</string> <string name="debug_dump_email_body" msgid="4577749800871444318">"Bijgevoegd is mijn contactendatabase met al mijn contactgegevens. Ga hier zorgvuldig mee om."</string> </resources> diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml deleted file mode 100644 index 6906957..0000000 --- a/res/values-pt-rBR/strings.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2009 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. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="sharedUserLabel" msgid="8024311725474286801">"Principais apps do Android"</string> - <string name="app_label" msgid="3389954322874982620">"Armazenamento de contatos"</string> - <string name="provider_label" msgid="6012150850819899907">"Contatos"</string> - <string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"A atualização de contatos precisa de mais memória."</string> - <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"Atualização do armazenamento para contatos"</string> - <string name="upgrade_out_of_memory_notification_text" msgid="8438179450336437626">"Toque para concluir a atualização."</string> - <string name="default_directory" msgid="93961630309570294">"Contatos"</string> - <string name="local_invisible_directory" msgid="705244318477396120">"Outros"</string> - <string name="voicemail_from_column" msgid="435732568832121444">"Correio de voz de "</string> - <string name="debug_dump_title" msgid="4916885724165570279">"Copiar banco de dados de contatos"</string> - <string name="debug_dump_database_message" msgid="406438635002392290">"Você está prestes a 1) fazer uma cópia de seu banco de dados no armazenamento interno, com todas as informações relacionadas aos contatos e todo o histórico de chamadas e 2) enviar essa cópia por e-mail. Lembre-se de excluir a cópia, logo que você a tiver copiado do dispositivo ou que o e-mail for recebido."</string> - <string name="debug_dump_delete_button" msgid="7832879421132026435">"Excluir agora"</string> - <string name="debug_dump_start_button" msgid="2837506913757600001">"Iniciar"</string> - <string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"Escolha um programa para enviar o arquivo"</string> - <string name="debug_dump_email_subject" msgid="108188398416385976">"BD de contatos anexado"</string> - <string name="debug_dump_email_body" msgid="4577749800871444318">"Meu banco de dados de contatos está anexado, Lá estão todas as informações de meus contatos. Use-o com cuidado."</string> -</resources> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index f6be18a..e01744e 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -20,16 +20,16 @@ <string name="app_label" msgid="3389954322874982620">"Stocarea datelor din Agendă"</string> <string name="provider_label" msgid="6012150850819899907">"Agendă"</string> <string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"Actualizarea agendei necesită mai multă memorie."</string> - <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"Măriți spaţiul de stocare pentru Agendă"</string> + <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"Măriţi spaţiul de stocare pentru Agendă"</string> <string name="upgrade_out_of_memory_notification_text" msgid="8438179450336437626">"Atingeţi pentru a finaliza actualizarea."</string> <string name="default_directory" msgid="93961630309570294">"Agendă"</string> <string name="local_invisible_directory" msgid="705244318477396120">"Altul"</string> <string name="voicemail_from_column" msgid="435732568832121444">"Mesaj vocal de la "</string> <string name="debug_dump_title" msgid="4916885724165570279">"Copiaţi baza de date a agendei"</string> - <string name="debug_dump_database_message" msgid="406438635002392290">"Sunteți pe cale 1) să faceţi o copie, pe stocarea internă, a bazei dvs. de date care include toate informaţiile referitoare la agendă și întregul jurnal de apeluri și 2) să trimiteți această copie prin e-mail. Nu uitați să ştergeţi această copie după ce aţi copiat-o de pe dispozitiv sau după ce a fost primit e-mailul."</string> + <string name="debug_dump_database_message" msgid="406438635002392290">"Sunteţi pe cale 1) să faceţi o copie, pe stocarea internă, a bazei dvs. de date care include toate informaţiile referitoare la agendă și întregul jurnal de apeluri și 2) să trimiteţi această copie prin e-mail. Nu uitaţi să ştergeţi această copie după ce aţi copiat-o de pe dispozitiv sau după ce a fost primit e-mailul."</string> <string name="debug_dump_delete_button" msgid="7832879421132026435">"Ștergeţi acum"</string> <string name="debug_dump_start_button" msgid="2837506913757600001">"Porniţi"</string> <string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"Alegeţi un program pentru a trimite fişierul"</string> <string name="debug_dump_email_subject" msgid="108188398416385976">"Atașată baza de date a agendei"</string> - <string name="debug_dump_email_body" msgid="4577749800871444318">"Vă trimit atașată baza de date cu toate informaţiile din agenda mea. Vă rog să o gestionaţi cu atenţie."</string> + <string name="debug_dump_email_body" msgid="4577749800871444318">"Vă trimit ataşată baza de date cu toate informaţiile din agenda mea. Vă rog să o gestionaţi cu atenţie."</string> </resources> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 97b65d5..89d5140 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -23,7 +23,7 @@ <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"Надограђивање меморије за контакте"</string> <string name="upgrade_out_of_memory_notification_text" msgid="8438179450336437626">"Додирните да бисте довршили надоградњу."</string> <string name="default_directory" msgid="93961630309570294">"Контакти"</string> - <string name="local_invisible_directory" msgid="705244318477396120">"Другo"</string> + <string name="local_invisible_directory" msgid="705244318477396120">"Други"</string> <string name="voicemail_from_column" msgid="435732568832121444">"Говорна пошта од "</string> <string name="debug_dump_title" msgid="4916885724165570279">"Копирање базе података са контактима"</string> <string name="debug_dump_database_message" msgid="406438635002392290">"Управо ћете 1) направити копију базе података која садржи све информације у вези са контактима и целокупну евиденцију позива у интерној меморији и 2) послати је имејлом. Не заборавите да избришете копију чим је будете копирали са уређаја или чим будете примили имејл."</string> diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml index 9cdeea0..1bd680a 100644 --- a/res/values-uz-rUZ/strings.xml +++ b/res/values-uz-rUZ/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="sharedUserLabel" msgid="8024311725474286801">"Android’ga asoslangan ilovalar"</string> - <string name="app_label" msgid="3389954322874982620">"Kontaktlar ombori"</string> + <string name="app_label" msgid="3389954322874982620">"Kontaktlar xotirasi"</string> <string name="provider_label" msgid="6012150850819899907">"Kontaktlar"</string> <string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"Kontaktlarni yangilash uchun ko‘proq xotira kerak."</string> <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"Kontaktlar uchun xotirani yangilash"</string> diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index d5c48a5..67719cc 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -1723,6 +1723,7 @@ public class ContactsProvider2 extends AbstractContactsProvider initForDefaultLocale(); mReadAccessLatch.countDown(); mReadAccessLatch = null; + updateDirectoriesInBackground(true); break; } |