diff options
76 files changed, 246 insertions, 124 deletions
diff --git a/java/res/layout/suggestions_strip.xml b/java/res/layout/suggestions_strip.xml index b962abef4..0b614993b 100644 --- a/java/res/layout/suggestions_strip.xml +++ b/java/res/layout/suggestions_strip.xml @@ -52,7 +52,6 @@ android:layout_height="match_parent"> <TextView android:id="@+id/important_notice_title" - android:text="@string/important_notice_title" android:layout_width="match_parent" android:layout_height="match_parent" android:padding="6sp" diff --git a/java/res/values-af/strings-config-important-notice.xml b/java/res/values-af/strings-config-important-notice.xml index eca184a89..f0857c9f3 100644 --- a/java/res/values-af/strings-config-important-notice.xml +++ b/java/res/values-af/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Leer uit jou kommunikasie en getikte data om voorstelle te verbeter"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-am/strings-config-important-notice.xml b/java/res/values-am/strings-config-important-notice.xml index 2fba008eb..f0857c9f3 100644 --- a/java/res/values-am/strings-config-important-notice.xml +++ b/java/res/values-am/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"የጥቆማ አስተያየቶችን ለማሻሻል ከእርስዎ ግንኙነቶች እና የተተየበ ውሂብ ይማሩ"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-ar/strings-config-important-notice.xml b/java/res/values-ar/strings-config-important-notice.xml index b2c4d3067..f0857c9f3 100644 --- a/java/res/values-ar/strings-config-important-notice.xml +++ b/java/res/values-ar/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"التعلم من اتصالاتك والبيانات التي تكتبها لتحسين الاقتراحات"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-az-rAZ/strings-config-important-notice.xml b/java/res/values-az-rAZ/strings-config-important-notice.xml index 477a27083..f0857c9f3 100644 --- a/java/res/values-az-rAZ/strings-config-important-notice.xml +++ b/java/res/values-az-rAZ/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Təklifləri inkişaf etdirmək üçün rabitənizdən və yazılmış datadan məlumat əldə edin"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-bg/strings-config-important-notice.xml b/java/res/values-bg/strings-config-important-notice.xml index 2ab2f3323..f0857c9f3 100644 --- a/java/res/values-bg/strings-config-important-notice.xml +++ b/java/res/values-bg/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Ползване на съобщ. ви и въведени от вас данни за подобряване на предложенията"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-ca/strings-config-important-notice.xml b/java/res/values-ca/strings-config-important-notice.xml index a3761a7b0..f0857c9f3 100644 --- a/java/res/values-ca/strings-config-important-notice.xml +++ b/java/res/values-ca/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Considera comunicacions i dades introduïdes per millorar sugger."</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-cs/strings-config-important-notice.xml b/java/res/values-cs/strings-config-important-notice.xml index a70140d6c..f0857c9f3 100644 --- a/java/res/values-cs/strings-config-important-notice.xml +++ b/java/res/values-cs/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Zlepšovat návrhy na základě vaší komunikace a zadaných dat"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-da/strings-config-important-notice.xml b/java/res/values-da/strings-config-important-notice.xml index 14d870ef9..f0857c9f3 100644 --- a/java/res/values-da/strings-config-important-notice.xml +++ b/java/res/values-da/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Giv bedre forslag ud fra tidligere kommunikation og data"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-de/strings-config-important-notice.xml b/java/res/values-de/strings-config-important-notice.xml index 11430c39c..f0857c9f3 100644 --- a/java/res/values-de/strings-config-important-notice.xml +++ b/java/res/values-de/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Vorschläge anhand bisheriger Nachrichten und Eingaben verbessern"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-el/strings-config-important-notice.xml b/java/res/values-el/strings-config-important-notice.xml index f47f0dd04..f0857c9f3 100644 --- a/java/res/values-el/strings-config-important-notice.xml +++ b/java/res/values-el/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Χρήση επικοινωνιών/δεδομένων πληκτρολόγησης για βελτίωση προτάσεων"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-en-rGB/strings-config-important-notice.xml b/java/res/values-en-rGB/strings-config-important-notice.xml index 3b41bfa10..f0857c9f3 100644 --- a/java/res/values-en-rGB/strings-config-important-notice.xml +++ b/java/res/values-en-rGB/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Learn from your communications and typed data to improve suggestions"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-en-rIN/strings-config-important-notice.xml b/java/res/values-en-rIN/strings-config-important-notice.xml index 3b41bfa10..f0857c9f3 100644 --- a/java/res/values-en-rIN/strings-config-important-notice.xml +++ b/java/res/values-en-rIN/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Learn from your communications and typed data to improve suggestions"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-es-rUS/strings-config-important-notice.xml b/java/res/values-es-rUS/strings-config-important-notice.xml index f019ee4b7..f0857c9f3 100644 --- a/java/res/values-es-rUS/strings-config-important-notice.xml +++ b/java/res/values-es-rUS/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Aprende de mensajes y datos ingresados para mejorar sugerencias."</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-es/strings-config-important-notice.xml b/java/res/values-es/strings-config-important-notice.xml index 79ea6b978..f0857c9f3 100644 --- a/java/res/values-es/strings-config-important-notice.xml +++ b/java/res/values-es/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Aprende de mensajes y datos escritos para mejorar sugerencias"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-et-rEE/strings-config-important-notice.xml b/java/res/values-et-rEE/strings-config-important-notice.xml index d6c5b7334..f0857c9f3 100644 --- a/java/res/values-et-rEE/strings-config-important-notice.xml +++ b/java/res/values-et-rEE/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Suhtlusest ja sisest. andmetest õppimine soovituste täiustamiseks"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-fa/strings-config-important-notice.xml b/java/res/values-fa/strings-config-important-notice.xml index 8f4d0919a..f0857c9f3 100644 --- a/java/res/values-fa/strings-config-important-notice.xml +++ b/java/res/values-fa/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"یادگیری از ارتباطات و اطلاعات تایپ شده شما برای بهبود پیشنهادات"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-fi/strings-config-important-notice.xml b/java/res/values-fi/strings-config-important-notice.xml index d4b1a11ab..f0857c9f3 100644 --- a/java/res/values-fi/strings-config-important-notice.xml +++ b/java/res/values-fi/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Ehdotusten parannus viestinnän ja kirjoitettujen tietojen avulla"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-fr-rCA/strings-config-important-notice.xml b/java/res/values-fr-rCA/strings-config-important-notice.xml index 9f0dcc178..f0857c9f3 100644 --- a/java/res/values-fr-rCA/strings-config-important-notice.xml +++ b/java/res/values-fr-rCA/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Apprendre de vos comm. et données entrées pour amél. suggestions"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-fr/strings-config-important-notice.xml b/java/res/values-fr/strings-config-important-notice.xml index 9013a397e..f0857c9f3 100644 --- a/java/res/values-fr/strings-config-important-notice.xml +++ b/java/res/values-fr/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Améliorer suggestions en fonction des messages et données saisies"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-hi/strings-config-important-notice.xml b/java/res/values-hi/strings-config-important-notice.xml index 45240b0b0..f0857c9f3 100644 --- a/java/res/values-hi/strings-config-important-notice.xml +++ b/java/res/values-hi/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"सुझावों में सुधार हेतु अपने संचार और लिखे गए डेटा से जानकारी पाएं"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-hr/strings-config-important-notice.xml b/java/res/values-hr/strings-config-important-notice.xml index 553fbf334..f0857c9f3 100644 --- a/java/res/values-hr/strings-config-important-notice.xml +++ b/java/res/values-hr/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Upotrijebi poruke i upisane podatke za poboljšanje prijedloga"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-hu/strings-config-important-notice.xml b/java/res/values-hu/strings-config-important-notice.xml index af7809543..f0857c9f3 100644 --- a/java/res/values-hu/strings-config-important-notice.xml +++ b/java/res/values-hu/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Javaslatok javítása a kommunikáció és begépelt adatok alapján"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-hy-rAM/strings-config-important-notice.xml b/java/res/values-hy-rAM/strings-config-important-notice.xml index e6ace3667..f0857c9f3 100644 --- a/java/res/values-hy-rAM/strings-config-important-notice.xml +++ b/java/res/values-hy-rAM/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Բարելավեք առաջարկները` ձեր զրույցներից և մուտքագրած տվյալներից"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-in/strings-config-important-notice.xml b/java/res/values-in/strings-config-important-notice.xml index 603b408da..f0857c9f3 100644 --- a/java/res/values-in/strings-config-important-notice.xml +++ b/java/res/values-in/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Belajar dari komunikasi & data terketik untuk meningkatkan saran"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-it/strings-config-important-notice.xml b/java/res/values-it/strings-config-important-notice.xml index 4a4bb0718..f0857c9f3 100644 --- a/java/res/values-it/strings-config-important-notice.xml +++ b/java/res/values-it/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Usa comunicazioni e dati digitati per migliorare i suggerimenti"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-iw/strings-config-important-notice.xml b/java/res/values-iw/strings-config-important-notice.xml index c04e240fb..f0857c9f3 100644 --- a/java/res/values-iw/strings-config-important-notice.xml +++ b/java/res/values-iw/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"למד מהתכתבויות ומנתונים שהקלדת כדי לשפר את ההצעות"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-ja/strings-config-important-notice.xml b/java/res/values-ja/strings-config-important-notice.xml index 0d4da7e1c..f0857c9f3 100644 --- a/java/res/values-ja/strings-config-important-notice.xml +++ b/java/res/values-ja/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"メッセージなどのやり取りや入力したデータから入力候補を予測します"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-ka-rGE/strings-config-important-notice.xml b/java/res/values-ka-rGE/strings-config-important-notice.xml index fe2d13694..f0857c9f3 100644 --- a/java/res/values-ka-rGE/strings-config-important-notice.xml +++ b/java/res/values-ka-rGE/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"უკეთესი შეთავაზებისთვის თქვენი კომუნიკაციიდან და ტექსტიდან სწავლა"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-km-rKH/strings-config-important-notice.xml b/java/res/values-km-rKH/strings-config-important-notice.xml index 301e544c3..f0857c9f3 100644 --- a/java/res/values-km-rKH/strings-config-important-notice.xml +++ b/java/res/values-km-rKH/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"រៀនពីការភ្ជាប់របស់អ្នក និងទិន្នន័យដែលបានបញ្ចូល ដើម្បីលើកកម្ពស់ការស្នើ"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-ko/strings-config-important-notice.xml b/java/res/values-ko/strings-config-important-notice.xml index 1ede0e585..f0857c9f3 100644 --- a/java/res/values-ko/strings-config-important-notice.xml +++ b/java/res/values-ko/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"사용자의 대화 내용과 입력한 데이터를 통해 추천 검색어의 정확도를 개선합니다."</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-lo-rLA/strings-config-important-notice.xml b/java/res/values-lo-rLA/strings-config-important-notice.xml index 6b2bc5b1d..f0857c9f3 100644 --- a/java/res/values-lo-rLA/strings-config-important-notice.xml +++ b/java/res/values-lo-rLA/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"ຮຽນຮູ້ຈາກການສື່ສານ ແລະຂໍ້ມູນທີ່ເຄີຍພິມຂອງທ່ານເພື່ອປັບປຸງຄຳແນະນຳ"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-lt/strings-config-important-notice.xml b/java/res/values-lt/strings-config-important-notice.xml index 7468e4a7d..f0857c9f3 100644 --- a/java/res/values-lt/strings-config-important-notice.xml +++ b/java/res/values-lt/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Mokytis iš ryšių ir įvestų duomenų, siekiant pagerinti pasiūlymus"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-lv/strings-config-important-notice.xml b/java/res/values-lv/strings-config-important-notice.xml index 8a80a0b32..f0857c9f3 100644 --- a/java/res/values-lv/strings-config-important-notice.xml +++ b/java/res/values-lv/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Izmantojiet saziņu un ievadītos datus, lai uzlabotu ieteikumus."</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-mn-rMN/strings-config-important-notice.xml b/java/res/values-mn-rMN/strings-config-important-notice.xml index a101765b5..f0857c9f3 100644 --- a/java/res/values-mn-rMN/strings-config-important-notice.xml +++ b/java/res/values-mn-rMN/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Зөвлөмжүүдийг сайжруулахын тулд таны харилцсан, бичсэн зүйлсээс суралцана"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-ms-rMY/strings-config-important-notice.xml b/java/res/values-ms-rMY/strings-config-important-notice.xml index 47ef54e82..f0857c9f3 100644 --- a/java/res/values-ms-rMY/strings-config-important-notice.xml +++ b/java/res/values-ms-rMY/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Belajar daripada komunikasi & data ditaip utk memperbaik cadangan"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-nb/strings-config-important-notice.xml b/java/res/values-nb/strings-config-important-notice.xml index ab2563b5c..f0857c9f3 100644 --- a/java/res/values-nb/strings-config-important-notice.xml +++ b/java/res/values-nb/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Lær av kommunikasjonen og inndataene dine for å få bedre forslag"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-ne-rNP/strings-config-important-notice.xml b/java/res/values-ne-rNP/strings-config-important-notice.xml index cb74c959e..f0857c9f3 100644 --- a/java/res/values-ne-rNP/strings-config-important-notice.xml +++ b/java/res/values-ne-rNP/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"सुझावहरू सुधार गर्न तपाईँको सञ्चारहरू र टाइप गरिएको डेटाबाट जान्नुहोस्"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-nl/strings-config-important-notice.xml b/java/res/values-nl/strings-config-important-notice.xml index bb12d4137..f0857c9f3 100644 --- a/java/res/values-nl/strings-config-important-notice.xml +++ b/java/res/values-nl/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Suggesties verbeteren met uw communicatie en getypte gegevens"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-pl/strings-config-important-notice.xml b/java/res/values-pl/strings-config-important-notice.xml index f87cd2b68..f0857c9f3 100644 --- a/java/res/values-pl/strings-config-important-notice.xml +++ b/java/res/values-pl/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Analizuj wiadomości i wpisywane dane, by ulepszać podpowiedzi"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-pt-rPT/strings-config-important-notice.xml b/java/res/values-pt-rPT/strings-config-important-notice.xml index f330c4b58..f0857c9f3 100644 --- a/java/res/values-pt-rPT/strings-config-important-notice.xml +++ b/java/res/values-pt-rPT/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Aprender com comunicações e dados introd. para melhorar sugestões"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-pt/strings-config-important-notice.xml b/java/res/values-pt/strings-config-important-notice.xml index de5ce0c1c..f0857c9f3 100644 --- a/java/res/values-pt/strings-config-important-notice.xml +++ b/java/res/values-pt/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Aprender com mensagens e dados digitados para melhorar sugestões"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-ro/strings-config-important-notice.xml b/java/res/values-ro/strings-config-important-notice.xml index bbd02e8ca..f0857c9f3 100644 --- a/java/res/values-ro/strings-config-important-notice.xml +++ b/java/res/values-ro/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Utilizați comunic. și datele introd. pt. a îmbunătăți sugestiile"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-ru/strings-config-important-notice.xml b/java/res/values-ru/strings-config-important-notice.xml index 01fa5bd9e..f0857c9f3 100644 --- a/java/res/values-ru/strings-config-important-notice.xml +++ b/java/res/values-ru/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Устройство будет запоминать то, что вы вводите чаще всего"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-sk/strings-config-important-notice.xml b/java/res/values-sk/strings-config-important-notice.xml index 0cabcda4c..f0857c9f3 100644 --- a/java/res/values-sk/strings-config-important-notice.xml +++ b/java/res/values-sk/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Zlepšovať návrhy na základe komunikácie a zadaných údajov"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-sl/strings-config-important-notice.xml b/java/res/values-sl/strings-config-important-notice.xml index 2bbdee36e..f0857c9f3 100644 --- a/java/res/values-sl/strings-config-important-notice.xml +++ b/java/res/values-sl/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Vaša sporočila in vnesene podatke uporabi za boljše predloge"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-sr/strings-config-important-notice.xml b/java/res/values-sr/strings-config-important-notice.xml index 0a4510bc8..f0857c9f3 100644 --- a/java/res/values-sr/strings-config-important-notice.xml +++ b/java/res/values-sr/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Користи комуникације и унете податке ради побољшања предлога"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-sv/strings-config-important-notice.xml b/java/res/values-sv/strings-config-important-notice.xml index bc56640e7..f0857c9f3 100644 --- a/java/res/values-sv/strings-config-important-notice.xml +++ b/java/res/values-sv/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Få bättre förslag genom att använda tidigare angiven data och annan kommunikation"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-sw/strings-config-important-notice.xml b/java/res/values-sw/strings-config-important-notice.xml index b5aac5f3b..f0857c9f3 100644 --- a/java/res/values-sw/strings-config-important-notice.xml +++ b/java/res/values-sw/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Jifunze kutoka kwa mawasiliano yako na data iliyocharazwa ili kuboresha mapendekezo"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-th/strings-config-important-notice.xml b/java/res/values-th/strings-config-important-notice.xml index 9fb02c45e..f0857c9f3 100644 --- a/java/res/values-th/strings-config-important-notice.xml +++ b/java/res/values-th/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"เรียนรู้จากการสื่อสารและข้อมูลที่พิมพ์ของคุณเพื่อปรับปรุงคำแนะนำ"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-tl/strings-config-important-notice.xml b/java/res/values-tl/strings-config-important-notice.xml index 454208c4c..f0857c9f3 100644 --- a/java/res/values-tl/strings-config-important-notice.xml +++ b/java/res/values-tl/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Pahusayin ang suhestiyon batay sa pag-uusap at na-type na data"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-tr/strings-config-important-notice.xml b/java/res/values-tr/strings-config-important-notice.xml index 3f15b82ea..f0857c9f3 100644 --- a/java/res/values-tr/strings-config-important-notice.xml +++ b/java/res/values-tr/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Önerileri iyileştirmek için iletişimlerimden ve yazılan verilerden öğren"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-uk/strings-config-important-notice.xml b/java/res/values-uk/strings-config-important-notice.xml index cb97f7fe1..f0857c9f3 100644 --- a/java/res/values-uk/strings-config-important-notice.xml +++ b/java/res/values-uk/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Пристрій буде запам’ятовувати, що ви пишете, надсилаєте й отримуєте"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-vi/strings-config-important-notice.xml b/java/res/values-vi/strings-config-important-notice.xml index 858611248..f0857c9f3 100644 --- a/java/res/values-vi/strings-config-important-notice.xml +++ b/java/res/values-vi/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Tìm hiểu từ thông tin liên lạc và dữ liệu đã nhập của bạn để cải thiện đề xuất"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-zh-rCN/strings-config-important-notice.xml b/java/res/values-zh-rCN/strings-config-important-notice.xml index 9ca18b53c..f0857c9f3 100644 --- a/java/res/values-zh-rCN/strings-config-important-notice.xml +++ b/java/res/values-zh-rCN/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"根据您的通信记录和以往输入的数据来完善建议"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-zh-rHK/strings-config-important-notice.xml b/java/res/values-zh-rHK/strings-config-important-notice.xml index 6b3807645..f0857c9f3 100644 --- a/java/res/values-zh-rHK/strings-config-important-notice.xml +++ b/java/res/values-zh-rHK/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"根據您的通訊記錄和已輸入的資料改善建議"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-zh-rTW/strings-config-important-notice.xml b/java/res/values-zh-rTW/strings-config-important-notice.xml index a3948d2da..f0857c9f3 100644 --- a/java/res/values-zh-rTW/strings-config-important-notice.xml +++ b/java/res/values-zh-rTW/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"根據您的通訊紀錄和以往輸入的資料改善建議項目"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values-zu/strings-config-important-notice.xml b/java/res/values-zu/strings-config-important-notice.xml index 2e755390e..f0857c9f3 100644 --- a/java/res/values-zu/strings-config-important-notice.xml +++ b/java/res/values-zu/strings-config-important-notice.xml @@ -22,5 +22,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="important_notice_title" msgid="1836002733109536160"></string> <string name="important_notice_contents" msgid="897137043719116217"></string> - <string name="use_personalized_dicts_summary" msgid="4331467814162666438">"Funda kusuka kwezoxhumano zakho nedatha ethayiphiwe ukuze uthuthukise iziphakamiso"</string> + <!-- no translation found for use_personalized_dicts_summary (590432261305469627) --> + <skip /> </resources> diff --git a/java/res/values/config-common.xml b/java/res/values/config-common.xml index 224aabdbb..20d5860e3 100644 --- a/java/res/values/config-common.xml +++ b/java/res/values/config-common.xml @@ -35,10 +35,10 @@ <integer name="config_ignore_alt_code_key_timeout">350</integer> - <integer name="config_key_preview_show_up_duration">0</integer> - <integer name="config_key_preview_dismiss_duration">70</integer> - <fraction name="config_key_preview_show_up_start_scale">100%</fraction> - <fraction name="config_key_preview_dismiss_end_scale">100%</fraction> + <integer name="config_key_preview_show_up_duration">17</integer> + <integer name="config_key_preview_dismiss_duration">53</integer> + <fraction name="config_key_preview_show_up_start_scale">98%</fraction> + <fraction name="config_key_preview_dismiss_end_scale">94%</fraction> <!-- TODO: consolidate key preview linger timeout with the above animation parameters. --> <integer name="config_key_preview_linger_timeout">70</integer> <!-- Suppress showing key preview duration after batch input in millisecond --> diff --git a/java/res/values/strings-config-important-notice.xml b/java/res/values/strings-config-important-notice.xml index 6a9fe28f7..3be95d333 100644 --- a/java/res/values/strings-config-important-notice.xml +++ b/java/res/values/strings-config-important-notice.xml @@ -20,7 +20,8 @@ <resources> <integer name="config_important_notice_version">0</integer> - <!-- The title of the important notice displayed on the suggestion strip. --> + <!-- TODO: Make title and contents resource to string array indexed by version. --> + <!-- The text of the important notice displayed on the suggestion strip. --> <string name="important_notice_title"></string> <!-- The contents of the important notice. --> <string name="important_notice_contents"></string> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index c9be4497a..a39ce4ae8 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -90,11 +90,11 @@ android:entries="@array/prefs_suggestion_visibilities" android:defaultValue="@string/prefs_suggestion_visibility_default_value" /> <CheckBoxPreference - android:key="pref_use_personalized_dicts" + android:key="pref_key_use_personalized_dicts" android:title="@string/use_personalized_dicts" android:summary="@string/use_personalized_dicts_summary" android:persistent="true" - android:defaultValue="false" /> + android:defaultValue="true" /> </PreferenceCategory> <PreferenceCategory android:title="@string/gesture_typing_category" diff --git a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java index 11a9d1fe4..ae9bdf3fc 100644 --- a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java @@ -89,8 +89,6 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary { } private synchronized void registerObserver(final Context context) { - // Perform a managed query. The Activity will handle closing and requerying the cursor - // when needed. if (mObserver != null) return; ContentResolver cres = context.getContentResolver(); cres.registerContentObserver(Contacts.CONTENT_URI, true, mObserver = diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java index 259c1372e..138a626a0 100644 --- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java +++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java @@ -512,7 +512,6 @@ public class DictionaryFacilitatorForSuggest { } } - @UsedForTesting public void clearUserHistoryDictionary() { if (mUserHistoryDictionary == null) { return; diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 459f6d8e1..94e3e7418 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -25,6 +25,9 @@ import android.app.AlertDialog; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; +import android.content.DialogInterface.OnClickListener; +import android.content.DialogInterface.OnDismissListener; +import android.content.DialogInterface.OnShowListener; import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; @@ -531,18 +534,33 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen } private void refreshPersonalizationDictionarySession() { + final Suggest suggest = mInputLogic.mSuggest; + final boolean shouldKeepUserHistoryDictionaries; + final boolean shouldKeepPersonalizationDictionaries; if (mSettings.getCurrent().mUsePersonalizedDicts) { - if (mSubtypeSwitcher.isSystemLocaleSameAsLocaleOfAllEnabledSubtypes()) { - final DictionaryFacilitatorForSuggest dictionaryFacilitator = - (mInputLogic.mSuggest == null) ? - null : mInputLogic.mSuggest.mDictionaryFacilitator; - PersonalizationDictionarySessionRegistrar.init(this, dictionaryFacilitator); - } else { - PersonalizationDictionarySessionRegistrar.close(this); - } + shouldKeepUserHistoryDictionaries = true; + // TODO: Eliminate this restriction + shouldKeepPersonalizationDictionaries = + mSubtypeSwitcher.isSystemLocaleSameAsLocaleOfAllEnabledSubtypes(); } else { - PersonalizationHelper.removeAllPersonalizedDictionaries(this); + shouldKeepUserHistoryDictionaries = false; + shouldKeepPersonalizationDictionaries = false; + } + if (!shouldKeepUserHistoryDictionaries) { + // Remove user history dictionaries. + PersonalizationHelper.removeAllUserHistoryDictionaries(this); + if (suggest != null) { + suggest.mDictionaryFacilitator.clearUserHistoryDictionary(); + } + } + if (!shouldKeepPersonalizationDictionaries) { + // Remove personalization dictionaries. + PersonalizationHelper.removeAllPersonalizationDictionaries(this); PersonalizationDictionarySessionRegistrar.resetAll(this); + } else { + final DictionaryFacilitatorForSuggest dictionaryFacilitator = + (suggest == null) ? null : suggest.mDictionaryFacilitator; + PersonalizationDictionarySessionRegistrar.init(this, dictionaryFacilitator); } } @@ -1165,27 +1183,33 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen @Override public void showImportantNoticeContents() { final Context context = this; - final DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() { + final AlertDialog.Builder builder = + new AlertDialog.Builder(context, AlertDialog.THEME_HOLO_DARK); + builder.setMessage(ImportantNoticeUtils.getNextImportantNoticeContents(context)); + builder.setPositiveButton(android.R.string.ok, null /* listener */); + final OnClickListener onClickListener = new OnClickListener() { @Override - public void onClick(final DialogInterface di, final int position) { - di.dismiss(); - ImportantNoticeUtils.updateLastImportantNoticeVersion(context); - if (position == DialogInterface.BUTTON_POSITIVE) { - setNeutralSuggestionStrip(); - return; - } + public void onClick(final DialogInterface dialog, final int position) { if (position == DialogInterface.BUTTON_NEGATIVE) { launchSettings(); - return; } } }; - final AlertDialog.Builder builder = - new AlertDialog.Builder(context, AlertDialog.THEME_HOLO_DARK); - builder.setMessage(R.string.important_notice_contents) - .setPositiveButton(android.R.string.ok, listener) - .setNegativeButton(R.string.go_to_settings, listener); - showOptionDialog(builder.create(), true /* cancelable */); + builder.setNegativeButton(R.string.go_to_settings, onClickListener); + final AlertDialog importantNoticeDialog = builder.create(); + importantNoticeDialog.setOnShowListener(new OnShowListener() { + @Override + public void onShow(final DialogInterface dialog) { + ImportantNoticeUtils.updateLastImportantNoticeVersion(context); + } + }); + importantNoticeDialog.setOnDismissListener(new OnDismissListener() { + @Override + public void onDismiss(final DialogInterface dialog) { + setNeutralSuggestionStrip(); + } + }); + showOptionDialog(importantNoticeDialog); } public void displaySettingsDialog() { @@ -1639,7 +1663,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen getString(R.string.language_selection_title), getString(ApplicationUtils.getActivityTitleResId(this, SettingsActivity.class)), }; - final DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() { + final OnClickListener listener = new OnClickListener() { @Override public void onClick(DialogInterface di, int position) { di.dismiss(); @@ -1660,18 +1684,18 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen }; final AlertDialog.Builder builder = new AlertDialog.Builder(this).setItems(items, listener).setTitle(title); - showOptionDialog(builder.create(), true /*cancelable */); + showOptionDialog(builder.create()); } // TODO: Move this method out of {@link LatinIME}. - private void showOptionDialog(final AlertDialog dialog, final boolean cancelable) { + private void showOptionDialog(final AlertDialog dialog) { final IBinder windowToken = mKeyboardSwitcher.getMainKeyboardView().getWindowToken(); if (windowToken == null) { return; } - dialog.setCancelable(cancelable); - dialog.setCanceledOnTouchOutside(cancelable); + dialog.setCancelable(true /* cancelable */); + dialog.setCanceledOnTouchOutside(true /* cancelable */); final Window window = dialog.getWindow(); final WindowManager.LayoutParams lp = window.getAttributes(); diff --git a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java b/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java index 2a195f58b..3e3cbf063 100644 --- a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java @@ -97,8 +97,6 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary { mLocale = localeStr; } mAlsoUseMoreRestrictiveLocales = alsoUseMoreRestrictiveLocales; - // Perform a managed query. The Activity will handle closing and re-querying the cursor - // when needed. ContentResolver cres = context.getContentResolver(); mObserver = new ContentObserver(null) { diff --git a/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java b/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java index df64bcec1..5ae2fb6f8 100644 --- a/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java +++ b/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java @@ -93,13 +93,16 @@ public class PersonalizationHelper { } } - public static void removeAllPersonalizedDictionaries(final Context context) { - removeAllDictionaries(context, sLangUserHistoryDictCache, - UserHistoryDictionary.NAME); + public static void removeAllPersonalizationDictionaries(final Context context) { removeAllDictionaries(context, sLangPersonalizationDictCache, PersonalizationDictionary.NAME); } + public static void removeAllUserHistoryDictionaries(final Context context) { + removeAllDictionaries(context, sLangUserHistoryDictCache, + UserHistoryDictionary.NAME); + } + private static <T extends DecayingExpandableBinaryDictionaryBase> void removeAllDictionaries( final Context context, final ConcurrentHashMap<String, SoftReference<T>> dictionaryMap, final String dictNamePrefix) { diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java index 501979645..b51c765f0 100644 --- a/java/src/com/android/inputmethod/latin/settings/Settings.java +++ b/java/src/com/android/inputmethod/latin/settings/Settings.java @@ -55,7 +55,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang public static final String PREF_MISC_SETTINGS = "misc_settings"; public static final String PREF_ADVANCED_SETTINGS = "pref_advanced_settings"; public static final String PREF_KEY_USE_CONTACTS_DICT = "pref_key_use_contacts_dict"; - public static final String PREF_USE_PERSONALIZED_DICTS = "pref_use_personalized_dicts"; + public static final String PREF_KEY_USE_PERSONALIZED_DICTS = "pref_key_use_personalized_dicts"; public static final String PREF_KEY_USE_DOUBLE_SPACE_PERIOD = "pref_key_use_double_space_period"; public static final String PREF_BLOCK_POTENTIALLY_OFFENSIVE = diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index 0f3deeaa9..77968f79a 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -128,7 +128,7 @@ public final class SettingsValues { Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST, false); mShowsLanguageSwitchKey = Settings.readShowsLanguageSwitchKey(prefs); mUseContactsDict = prefs.getBoolean(Settings.PREF_KEY_USE_CONTACTS_DICT, true); - mUsePersonalizedDicts = prefs.getBoolean(Settings.PREF_USE_PERSONALIZED_DICTS, false); + mUsePersonalizedDicts = prefs.getBoolean(Settings.PREF_KEY_USE_PERSONALIZED_DICTS, true); mUseDoubleSpacePeriod = prefs.getBoolean(Settings.PREF_KEY_USE_DOUBLE_SPACE_PERIOD, true); mBlockPotentiallyOffensive = Settings.readBlockPotentiallyOffensive(prefs, res); mAutoCorrectEnabled = Settings.readAutoCorrectEnabled(autoCorrectionThresholdRawValue, res); diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java index e77c55069..8ea712835 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java +++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java @@ -504,12 +504,13 @@ final class SuggestionStripLayoutHelper { hintView, 1.0f - mCenterSuggestionWeight, ViewGroup.LayoutParams.MATCH_PARENT); } - public void layoutImportantNotice(final View importantNoticeStrip, final int stripWidth) { + public void layoutImportantNotice(final View importantNoticeStrip, final int stripWidth, + final String importantNoticeTitle) { final TextView titleView = (TextView)importantNoticeStrip.findViewById( R.id.important_notice_title); final int width = stripWidth - titleView.getPaddingLeft() - titleView.getPaddingRight(); titleView.setTextColor(mColorAutoCorrect); - final CharSequence importantNoticeTitle = titleView.getText(); + titleView.setText(importantNoticeTitle); titleView.setTextScaleX(1.0f); // Reset textScaleX. final float titleScaleX = getTextScaleX( importantNoticeTitle, width, titleView.getPaint()); diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java index 1f80c4cca..4ef562d8f 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java +++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Color; import android.support.v4.view.ViewCompat; +import android.text.TextUtils; import android.util.AttributeSet; import android.util.TypedValue; import android.view.GestureDetector; @@ -236,7 +237,12 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick if (width <= 0) { return false; } - mLayoutHelper.layoutImportantNotice(mImportantNoticeStrip, width); + final String importantNoticeTitle = ImportantNoticeUtils.getNextImportantNoticeTitle( + getContext()); + if (TextUtils.isEmpty(importantNoticeTitle)) { + return false; + } + mLayoutHelper.layoutImportantNotice(mImportantNoticeStrip, width, importantNoticeTitle); mStripVisibilityGroup.showImportantNoticeStrip(); mImportantNoticeStrip.setOnClickListener(this); return true; diff --git a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryList.java b/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryList.java index 2f41ce9ce..97a924d7b 100644 --- a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryList.java +++ b/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryList.java @@ -53,8 +53,7 @@ public class UserDictionaryList extends PreferenceFragment { } public static TreeSet<String> getUserDictionaryLocalesSet(Activity activity) { - @SuppressWarnings("deprecation") - final Cursor cursor = activity.managedQuery(UserDictionary.Words.CONTENT_URI, + final Cursor cursor = activity.getContentResolver().query(UserDictionary.Words.CONTENT_URI, new String[] { UserDictionary.Words.LOCALE }, null, null, null); final TreeSet<String> localeSet = new TreeSet<String>(); diff --git a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettings.java b/java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettings.java index 220efb5d3..cf2014a1a 100644 --- a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettings.java +++ b/java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettings.java @@ -141,7 +141,10 @@ public class UserDictionarySettings extends ListFragment { mLocale = locale; // WARNING: The following cursor is never closed! TODO: don't put that in a member, and - // make sure all cursors are correctly closed. + // make sure all cursors are correctly closed. Also, this comes from a call to + // Activity#managedQuery, which has been deprecated for a long time (and which FORBIDS + // closing the cursor, so take care when resolving this TODO). We should either use a + // regular query and close the cursor, or switch to a LoaderManager and a CursorLoader. mCursor = createCursor(locale); TextView emptyView = (TextView) getView().findViewById(android.R.id.empty); emptyView.setText(R.string.user_dict_settings_empty_text); diff --git a/java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java b/java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java index 50a942382..6b0bb86ac 100644 --- a/java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java +++ b/java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java @@ -30,8 +30,9 @@ public final class ImportantNoticeUtils { // {@link SharedPreferences} name to save the last important notice version that has been // displayed to users. - private static final String PREFERENCE_NAME = "important_notice"; + private static final String PREFERENCE_NAME = "important_notice_pref"; private static final String KEY_IMPORTANT_NOTICE_VERSION = "important_notice_version"; + public static final int VERSION_TO_ENABLE_PERSONALIZED_SUGGESTIONS = 1; // Copy of the hidden {@link Settings.Secure#USER_SETUP_COMPLETE} settings key. // The value is zero until each multiuser completes system setup wizard. @@ -59,13 +60,20 @@ public final class ImportantNoticeUtils { return context.getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); } - private static int getCurrentImportantNoticeVersion(final Context context) { + public static int getCurrentImportantNoticeVersion(final Context context) { return context.getResources().getInteger(R.integer.config_important_notice_version); } + private static int getLastImportantNoticeVersion(final Context context) { + return getImportantNoticePreferences(context).getInt(KEY_IMPORTANT_NOTICE_VERSION, 0); + } + + private static int getNextImportantNoticeVersion(final Context context) { + return getLastImportantNoticeVersion(context) + 1; + } + private static boolean hasNewImportantNotice(final Context context) { - final SharedPreferences prefs = getImportantNoticePreferences(context); - final int lastVersion = prefs.getInt(KEY_IMPORTANT_NOTICE_VERSION, 0); + final int lastVersion = getLastImportantNoticeVersion(context); return getCurrentImportantNoticeVersion(context) > lastVersion; } @@ -78,9 +86,29 @@ public final class ImportantNoticeUtils { } public static void updateLastImportantNoticeVersion(final Context context) { - final SharedPreferences prefs = getImportantNoticePreferences(context); - prefs.edit() - .putInt(KEY_IMPORTANT_NOTICE_VERSION, getCurrentImportantNoticeVersion(context)) + getImportantNoticePreferences(context) + .edit() + .putInt(KEY_IMPORTANT_NOTICE_VERSION, getNextImportantNoticeVersion(context)) .apply(); } + + // TODO: Make title resource to string array indexed by version. + public static String getNextImportantNoticeTitle(final Context context) { + switch (getNextImportantNoticeVersion(context)) { + case VERSION_TO_ENABLE_PERSONALIZED_SUGGESTIONS: + return context.getString(R.string.important_notice_title); + default: + return null; + } + } + + // TODO: Make content resource to string array indexed by version. + public static String getNextImportantNoticeContents(final Context context) { + switch (getNextImportantNoticeVersion(context)) { + case VERSION_TO_ENABLE_PERSONALIZED_SUGGESTIONS: + return context.getString(R.string.important_notice_contents); + default: + return null; + } + } } diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp index c81c61d23..04f119803 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp @@ -76,7 +76,7 @@ namespace latinime { } const Ver4DictBuffers::Ver4DictBuffersPtr dictBuffers = Ver4DictBuffers::openVer4DictBuffers(dictPath, mmappedBuffer); - if (!dictBuffers.get()->isValid()) { + if (!dictBuffers.get() || !dictBuffers.get()->isValid()) { AKLOGE("DICT: The dictionary doesn't satisfy ver4 format requirements. path: %s", path); ASSERT(false); diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.cpp index 918c02ba2..59dedee72 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.cpp @@ -28,9 +28,14 @@ namespace latinime { /* static */ Ver4DictBuffers::Ver4DictBuffersPtr Ver4DictBuffers::openVer4DictBuffers( const char *const dictPath, const MmappedBuffer::MmappedBufferPtr &headerBuffer) { - const bool isUpdatable = headerBuffer.get() ? headerBuffer.get()->isUpdatable() : false; + if (!headerBuffer.get()) { + ASSERT(false); + AKLOGE("The header buffer must be valid to open ver4 dict buffers."); + return Ver4DictBuffersPtr(0); + } // TODO: take only dictDirPath, and open both header and trie files in the constructor below - return Ver4DictBuffersPtr(new Ver4DictBuffers(dictPath, headerBuffer, isUpdatable)); + return Ver4DictBuffersPtr(new Ver4DictBuffers( + dictPath, headerBuffer, headerBuffer.get()->isUpdatable())); } bool Ver4DictBuffers::flushHeaderAndDictBuffers(const char *const dictDirPath, @@ -113,10 +118,11 @@ Ver4DictBuffers::Ver4DictBuffers(const char *const dictPath, mDictBuffer(MmappedBuffer::openBuffer(dictPath, Ver4DictConstants::TRIE_FILE_EXTENSION, isUpdatable)), mHeaderPolicy(headerBuffer.get()->getBuffer(), FormatUtils::VERSION_4), - mExpandableHeaderBuffer(headerBuffer.get()->getBuffer(), mHeaderPolicy.getSize(), + mExpandableHeaderBuffer(headerBuffer.get() ? headerBuffer.get()->getBuffer() : 0, + mHeaderPolicy.getSize(), BufferWithExtendableBuffer::DEFAULT_MAX_ADDITIONAL_BUFFER_SIZE), - mExpandableTrieBuffer(mDictBuffer.get()->getBuffer(), - mDictBuffer.get()->getBufferSize(), + mExpandableTrieBuffer(mDictBuffer.get() ? mDictBuffer.get()->getBuffer() : 0, + mDictBuffer.get() ? mDictBuffer.get()->getBufferSize() : 0, BufferWithExtendableBuffer::DEFAULT_MAX_ADDITIONAL_BUFFER_SIZE), mTerminalPositionLookupTable(dictPath, isUpdatable), mProbabilityDictContent(dictPath, mHeaderPolicy.hasHistoricalInfoOfWords(), diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h index a0c219e4d..776bb9882 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h @@ -42,7 +42,7 @@ class Ver4DictBuffers { } AK_FORCE_INLINE bool isValid() const { - return mDictBuffer.get() != 0 && mHeaderPolicy.isValid() + return mHeaderBuffer.get() && mDictBuffer.get() && mHeaderPolicy.isValid() && mProbabilityDictContent.isValid() && mTerminalPositionLookupTable.isValid() && mBigramDictContent.isValid() && mShortcutDictContent.isValid(); } |