Merge "[2]Pass context to StatsUtilsManager for alarms."
diff --git a/java/res/values-af/strings.xml b/java/res/values-af/strings.xml
index cbee42a..1ce29e1 100644
--- a/java/res/values-af/strings.xml
+++ b/java/res/values-af/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Gevorderd"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Aktiveer verdeelde sleutelbord"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Vee jou gesinkroniseerde data van Google af uit"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Jou gesinkroniseerde data sal uitgevee word. Is jy seker?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Vee uit"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Kanselleer"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Skakel oor na die ander invoermetodes"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Taal-wisselsleutel dek ook ander invoermetodes"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Taal-wisselsleutel"</string>
diff --git a/java/res/values-am/strings.xml b/java/res/values-am/strings.xml
index 8bc90f0..7d78018 100644
--- a/java/res/values-am/strings.xml
+++ b/java/res/values-am/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"የላቀ"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"ገፅታ"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"የተከፈለ ቁልፍ ሰሌዳ አንቃ"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"ከGoogle የእርስዎን የተመሳሰለ ውሂብ ይሰርዛል"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"የእርስዎ የተመሳሰለ ውሂብ ይሰረዛል። እርግጠኛ ነዎት?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"ሰርዝ"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"ይቅር"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"ወደ ሌሎች የግቤት ስልቶች ቀይር"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"የቋንቋ መቀየሪያ ቁልፍ ሌሎች የግቤት ስልቶችንም ይሸፍናል"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"የቋንቋ መቀየሪያ ቁልፍ"</string>
diff --git a/java/res/values-az-rAZ/strings.xml b/java/res/values-az-rAZ/strings.xml
index d88d9ba..d42b428 100644
--- a/java/res/values-az-rAZ/strings.xml
+++ b/java/res/values-az-rAZ/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Qabaqcıl"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Klaviaturanı ayırmağa icazə verin"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Google\'dan olan sinx datanızı siləcək."</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Sinx olunmuş datanız silinəcək. Buns əminsiniz?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Silin"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Ləğv et"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Digər daxiletmə metodlarına keçin"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Dil keçid düyməsi başqa daxiletmə metodlarını da əhatə edir"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Dil keçidi düyməsi"</string>
diff --git a/java/res/values-bg/strings.xml b/java/res/values-bg/strings.xml
index de56050..ccd4aae 100644
--- a/java/res/values-bg/strings.xml
+++ b/java/res/values-bg/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Разширени"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Тема"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Активиране на разделената клавиатура"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Изтрива синхронизираните ви данни от Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Синхронизираните ви данни ще се изтрият. Наистина ли искате това?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Изтриване"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Отказ"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Други методи за въвеждане"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Клавишът за превкл. на езика обхваща и други методи за въвеждане"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Клавиш за превкл. на езика"</string>
diff --git a/java/res/values-bn-rBD/strings.xml b/java/res/values-bn-rBD/strings.xml
index ff08769..6ba7b2a 100644
--- a/java/res/values-bn-rBD/strings.xml
+++ b/java/res/values-bn-rBD/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"উন্নত"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"থিম"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"বিভক্ত কীবোর্ড সক্ষম করুন"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Google থেকে আপনার সিঙ্ক করা ডেটা মুছে ফেলে"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"আপনার সিঙ্ক করা ডেটা মুছে ফেলা হবে৷ আপনি কি নিশ্চিত?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"মুছুন"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"বাতিল করুন"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"অন্য ইনপুট পদ্ধতিতে স্যুইচ করুন"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"ভাষা স্যুইচ কীতে অন্যান্য ইনপুট পদ্ধতি পাওয়া যায়"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"ভাষা স্যুইচ কী"</string>
diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml
index e0c79fc..b1d2346 100644
--- a/java/res/values-ca/strings.xml
+++ b/java/res/values-ca/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Avançat"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Activa el teclat partit"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Suprimeix les dades sincronitzades de Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Les dades sincronitzades se suprimiran. Confirmes que vols suprimir-les?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Suprimeix"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Cancel·la"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Altres mètodes d\'introducció"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"La tecla de canvi d\'idioma serveix també per a altres mètodes d\'entrada"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Tecla de canvi d\'idioma"</string>
diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml
index d30f8e8..6717bb3 100644
--- a/java/res/values-cs/strings.xml
+++ b/java/res/values-cs/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Rozšířená nastavení"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Motiv"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Aktivovat rozdělenou klávesnici"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Smaže z Googlu vaše synchronizovaná data"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Vaše synchronizovaná data budou smazána. Jste si jisti?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Smazat"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Zrušit"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Přepínat metody zadávání"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Klávesa pro přepínání jazyka ovládá i další metody zadávání"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Klávesa přepínání jazyka"</string>
diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml
index 6f2adf0..b4fd6c8 100644
--- a/java/res/values-da/strings.xml
+++ b/java/res/values-da/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Avanceret"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Aktivér delt tastatur"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Sletter dine synkroniserede data fra Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Dine synkroniserede data bliver slettet. Er du sikker?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Slet"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Annuller"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Skift inputmetode"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tasten til sprogskift gælder også for andre inputmetoder"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Knap til sprogskift"</string>
@@ -71,8 +67,8 @@
<string name="auto_correction_summary" msgid="5625751551134658006">"Mellemrumstast og tegnsætning retter automatisk forkerte ord"</string>
<string name="auto_correction_threshold_mode_off" msgid="8470882665417944026">"Fra"</string>
<string name="auto_correction_threshold_mode_modest" msgid="8788366690620799097">"Moderat"</string>
- <string name="auto_correction_threshold_mode_aggressive" msgid="7319007299148899623">"Aggressiv"</string>
- <string name="auto_correction_threshold_mode_very_aggressive" msgid="1853309024129480416">"Meget aggressiv"</string>
+ <string name="auto_correction_threshold_mode_aggressive" msgid="7319007299148899623">"Middel"</string>
+ <string name="auto_correction_threshold_mode_very_aggressive" msgid="1853309024129480416">"Maksimal"</string>
<string name="bigram_prediction" msgid="1084449187723948550">"Forslag til næste ord"</string>
<string name="bigram_prediction_summary" msgid="3896362682751109677">"Brug det forrige ord til at give forslag"</string>
<string name="gesture_input" msgid="826951152254563827">"Aktivér glidende indtastning"</string>
diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml
index 86e504e..5e0ca54 100644
--- a/java/res/values-de/strings.xml
+++ b/java/res/values-de/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Erweitert"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Design"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Geteilte Tastatur aktivieren"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Löscht Ihre synchronisierten Daten aus Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Ihre synchronisierten Daten werden gelöscht. Sind Sie sicher?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Löschen"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Abbrechen"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Eingabemethoden wechseln"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Sprachwechseltaste umfasst auch andere Eingabemethoden."</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Sprachwechsel"</string>
diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml
index 963c0c8..2fbbd61 100644
--- a/java/res/values-el/strings.xml
+++ b/java/res/values-el/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Σύνθετες"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Θέμα"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Ενεργοποίηση διαχωρισμού πληκτρολογίου"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Διαγράφει τα συγχρονισμένα δεδομένα σας από το Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Τα συγχρονισμένα δεδομένα σας θα διαγραφούν. Είστε βέβαιοι;"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Διαγραφή"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Ακύρωση"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Άλλη μέθοδος εισόδου"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Το κλειδί αλλαγής γλώσσας καλύπτει και άλλες μεθόδους εισόδου"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Πλήκτρο εναλλαγής γλώσσας"</string>
diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml
index 03846e7..b381176 100644
--- a/java/res/values-es-rUS/strings.xml
+++ b/java/res/values-es-rUS/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Avanzada"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Habilitar teclado dividido"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Elimina los datos sincronizados de Google."</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Se eliminarán los datos sincronizados. ¿Confirmas la acción?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Eliminar"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Cancelar"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Otros métodos de entrada"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"La tecla de cambio de idioma abarca otros métodos de entrada."</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Tecla de selección de idioma"</string>
diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml
index d4c3ade..4b958ac 100644
--- a/java/res/values-es/strings.xml
+++ b/java/res/values-es/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Opciones avanzadas"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Habilitar teclado dividido"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Elimina tus datos sincronizados de Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Los datos sincronizados se eliminarán. ¿Seguro que quieres continuar?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Eliminar"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Cancelar"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Otros métodos de introducción"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"La tecla de cambio de idioma sirve también para otros métodos"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Tecla para cambiar de idioma"</string>
diff --git a/java/res/values-et-rEE/strings.xml b/java/res/values-et-rEE/strings.xml
index 7606c1f..5386666 100644
--- a/java/res/values-et-rEE/strings.xml
+++ b/java/res/values-et-rEE/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Täpsem"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Teema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Luba kaheks jaotatud klaviatuur"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Kustutab sünkroonitud andmed Google\'ist"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Sünkroonitud andmed kustutatakse. Kas olete kindel?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Kustuta"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Tühista"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Vaheta sisestusmeetodit"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Keelevahetuse võti hõlmab ka muid sisestusmeetodeid"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Keelevahetuse nupp"</string>
diff --git a/java/res/values-eu-rES/strings.xml b/java/res/values-eu-rES/strings.xml
index d510f6a..3e8a2ff 100644
--- a/java/res/values-eu-rES/strings.xml
+++ b/java/res/values-eu-rES/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Ezarpen aurreratuak"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Gaia"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Gaitu teklatu banatua"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Sinkronizatutako datuak ezabatzen ditu Google-tik"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Sinkronizatutako datuak ezabatuko dira. Ziur hori egin nahi duzula?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Ezabatu"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Utzi"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Aldatu idazketa-metodoa"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Hizkuntza aldatzeko teklak beste idazketa-metodoetarako ere balio du"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Hizkuntza aldatzeko tekla"</string>
diff --git a/java/res/values-fi/strings.xml b/java/res/values-fi/strings.xml
index 1d4ac6c..cfe0d98 100644
--- a/java/res/values-fi/strings.xml
+++ b/java/res/values-fi/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Lisäasetukset"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Teema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Ota jaettu näppäimistö käyttöön"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Poistaa synkronoidut tietosi Googlen palveluista"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Synkronoidut tietosi poistetaan. Oletko varma?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Poista"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Peruuta"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Käytä toista syöttötapaa"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Kielenvaihtonäppäin kattaa myös muut syöttötavat"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Kielenvaihtonäppäin"</string>
diff --git a/java/res/values-fr-rCA/strings.xml b/java/res/values-fr-rCA/strings.xml
index 4cb0523..414adc1 100644
--- a/java/res/values-fr-rCA/strings.xml
+++ b/java/res/values-fr-rCA/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Avancés"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Thème"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Activer le clavier en deux parties"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Supprime vos données synchronisées de Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Vos données synchronisées seront supprimés. Êtes-vous sûr?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Supprimer"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Annuler"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Autres modes de saisie"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"La touche de sélection de langue couvre d\'autres modes de saisie"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Touche de sélection de langue"</string>
diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml
index 404470a..21fb5aa 100644
--- a/java/res/values-fr/strings.xml
+++ b/java/res/values-fr/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Paramètres avancés"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Thème"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Activer le clavier en deux parties"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Supprime vos données synchronisées de Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Vos données synchronisées seront supprimées. Voulez-vous vraiment continuer ?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Supprimer"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Annuler"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Autres modes de saisie"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"La touche de sélection de langue couvre d\'autres modes de saisie."</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Touche de sélection de langue"</string>
diff --git a/java/res/values-gl-rES/strings.xml b/java/res/values-gl-rES/strings.xml
index e9b6969..4c5f35f 100644
--- a/java/res/values-gl-rES/strings.xml
+++ b/java/res/values-gl-rES/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Opcións avanzadas"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Activar teclado dividido"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Elimina os teus datos sincronizados de Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Eliminaranse os teus datos sincronizados. Estás seguro?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Eliminar"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Cancelar"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Outros métodos de entrada"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"A tecla de cambio de idioma inclúe outros métodos de entrada"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Tecla de cambio de idioma"</string>
diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml
index 3d0edf4..90fd06c 100644
--- a/java/res/values-hi/strings.xml
+++ b/java/res/values-hi/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"अतिरिक्त सेटिंग"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"थीम"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"स्प्लिट कीबोर्ड सक्षम करें"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Google से आपका समन्वयित डेटा हटाता है"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"आपका समन्वयित डेटा हटा दिया जाएगा. क्या आप सुनिश्चित हैं?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"हटाएं"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"रहने दें"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"अन्य इनपुट पद्धतियों पर जाएं"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"भाषा स्विच कुंजी में अन्य इनपुट पद्धतियां भी शामिल हैं"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"भाषा स्विच कुंजी"</string>
diff --git a/java/res/values-hr/strings.xml b/java/res/values-hr/strings.xml
index ce400d2..51a8e9d 100644
--- a/java/res/values-hr/strings.xml
+++ b/java/res/values-hr/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Napredno"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Omogući razdvojenu tipkovnicu"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Brisanje vaših sinkroniziranih podataka s Googlea"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Vaši će se sinkronizirani podaci izbrisati. Jeste li sigurni?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Izbriši"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Odustani"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Prebaci na druge unose"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tipka za prebacivanje jezika pokriva i druge načine unosa"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Tipka za izmjenjivanje jezika"</string>
diff --git a/java/res/values-hu/strings.xml b/java/res/values-hu/strings.xml
index e10248e..b36767e 100644
--- a/java/res/values-hu/strings.xml
+++ b/java/res/values-hu/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Speciális"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Téma"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Megosztott billentyűzet bekapcsolása"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Törli a Google rendszeréből a szinkronizált adatokat"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"A szinkronizált adatok törlődni fognak. Biztosan folytatja?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Törlés"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Mégse"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Váltás más beviteli módra"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"A nyelvkapcsoló gomb egyéb beviteli módokat is tartalmaz"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"A nyelvkapcsoló"</string>
diff --git a/java/res/values-hy-rAM/strings.xml b/java/res/values-hy-rAM/strings.xml
index fee3513..409d7c0 100644
--- a/java/res/values-hy-rAM/strings.xml
+++ b/java/res/values-hy-rAM/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Հավելյալ"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Թեմա"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Միացնել բաժանված ստեղնաշարը"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Google- ից ջնջում է ձեր համաժամեցրած տվյալները"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Ձեր համաժամեցրած տվյալները ջնջվելու են: Շարունակե՞լ:"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Ջնջել"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Չեղարկել"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Անցնել մուտքագրման այլ եղանակների"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Լեզվի փոխարկման բանալին ընդգրկում է այլ մուտքագրման եղանակներ ևս"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Լեզվի փոխարկման ստեղն"</string>
diff --git a/java/res/values-is-rIS/strings.xml b/java/res/values-is-rIS/strings.xml
index 6d18ffd..2424f31 100644
--- a/java/res/values-is-rIS/strings.xml
+++ b/java/res/values-is-rIS/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Ítarlegt"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Þema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Virkja skipt lyklaborð"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Eyðir samstilltum gögnum af Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Samstilltum gögnum verður eytt. Ertu viss?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Eyða"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Hætta við"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Skipta um innsláttaraðferð"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Lykill til að skipta um mál inniheldur aðrar innsláttaraðferðir"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Lykill til að breyta tungumáli"</string>
diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml
index 1c0ffa9..686ffa9 100644
--- a/java/res/values-it/strings.xml
+++ b/java/res/values-it/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Avanzate"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Attiva tastiera divisa"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"I dati sincronizzati vengono eliminati da Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"I dati sincronizzati verranno eliminati. Confermi?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Elimina"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Annulla"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Altri metodi immissione"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Il tasto per cambiare lingua offre altri metodi di immissione"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Tasto cambio lingua"</string>
diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml
index 9a43008..f818c5d 100644
--- a/java/res/values-ja/strings.xml
+++ b/java/res/values-ja/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"詳細設定"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"テーマ"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"スプリットキーボードを有効にする"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Googleから同期データを削除します"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"同期データを削除します。よろしいですか？"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"削除"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"キャンセル"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"他の入力方法に切り替え"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"言語切り替えキーは他の入力方法にも対応しています"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"言語切り替えキー"</string>
diff --git a/java/res/values-ka-rGE/strings.xml b/java/res/values-ka-rGE/strings.xml
index 71ec1f1..75a77b5 100644
--- a/java/res/values-ka-rGE/strings.xml
+++ b/java/res/values-ka-rGE/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"გაფართოებული"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"თემა"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"გაყოფილი კლავიატურის გააქტიურება"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"წაშლის Google-თან თქვენს სინქრონიზებულს მონაცემებს"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"თქვენი სინქრონიზებული მონაცემები წაიშლება. დარწმუნებული ხართ?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"წაშლა"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"გაუქმება"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"შეყვანის სხვა მეთოდებზე გადართვა"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"ენის გადართვის ღილაკს შეყვანის სხვა მეთოდებსაც შეიცავს"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"ენის გადართვის კლავიში"</string>
diff --git a/java/res/values-kk-rKZ/strings.xml b/java/res/values-kk-rKZ/strings.xml
index 31097d7..797dfce 100644
--- a/java/res/values-kk-rKZ/strings.xml
+++ b/java/res/values-kk-rKZ/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Кеңейтілген"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Тақырып"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Бөлінген пернетақтаны қосу"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Синхрондалған деректерді Google жүйесінен жояды"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Синхрондалған деректер жойылады. Сенімдісіз бе?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Жою"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Бас тарту"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Басқа енгізу әдістеріне ауыстырыңыз"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Тілді ауыстыру пернесі басқа енгізу әдістерін де қамтиды"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Тілді ауыстыру пернесі"</string>
diff --git a/java/res/values-km-rKH/strings.xml b/java/res/values-km-rKH/strings.xml
index 95c96f2..6a9cc07 100644
--- a/java/res/values-km-rKH/strings.xml
+++ b/java/res/values-km-rKH/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"កម្រិតខ្ពស់"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"រូបរាង"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"បើកការបំបែកក្ដារចុច"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"លុបទិន្នន័យដែលបានធ្វើសមកាលកម្មរបស់អ្នកចេញពី Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"ទិន្នន័យដែលបានធ្វើសមកាលកម្មរបស់អ្នកនឹងត្រូវបានលុប។ តើអ្នកប្រាកដទេ?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"លុប"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"បោះបង់"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"ប្ដូរទៅវិធីសាស្ត្របញ្ចូលផ្សេងទៀត"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"គ្រាប់ចុចប្ដូរភាសាតាមវិធីសាស្ត្របញ្ចូលផ្សេងទៀត"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"គ្រាប់ចុចប្ដូរភាសា"</string>
diff --git a/java/res/values-kn-rIN/strings.xml b/java/res/values-kn-rIN/strings.xml
index 3b45511..508ff24 100644
--- a/java/res/values-kn-rIN/strings.xml
+++ b/java/res/values-kn-rIN/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"ಸುಧಾರಿತ"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"ಥೀಮ್"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"ಬೇರ್ಪಡೆ ಕೀಬೋರ್ಡ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Google ನಿಂದ ನಿಮ್ಮ ಸಿಂಕ್ ಮಾಡಲಾದ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"ನಿಮ್ಮ ಸಿಂಕ್ ಮಾಡಿದ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ. ನೀವು ಖಚಿತವಾಗಿರುವಿರಾ?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"ಅಳಿಸು"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"ರದ್ದುಮಾಡು"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"ಇತರೆ ಇನ್ಪುಟ್ ವಿಧಾನಗಳಿಗೆ ಬದಲಾಯಿಸು"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"ಭಾಷಾ ಬದಲಾವಣೆ ಕೀಯು ಇತರೆ ಇನ್ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಕೂಡ ಒಳಗೊಂಡಿರುತ್ತದೆ"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"ಭಾಷೆ ಬದಲಾವಣೆ ಕೀ"</string>
diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml
index 7e609e9..fd4fe8c 100644
--- a/java/res/values-ko/strings.xml
+++ b/java/res/values-ko/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"고급"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"테마"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"분할 키보드 사용"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Google에서 동기화된 데이터 삭제"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"동기화된 데이터가 삭제됩니다. 계속하시겠습니까?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"삭제"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"취소"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"다른 입력 방법으로 전환"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"언어 전환 키가 제공하는 기타 입력 방법"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"언어 전환 키"</string>
diff --git a/java/res/values-ky-rKG/strings.xml b/java/res/values-ky-rKG/strings.xml
index 14d5601..5974a42 100644
--- a/java/res/values-ky-rKG/strings.xml
+++ b/java/res/values-ky-rKG/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Өркүндөтүлгөн"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Тема"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Баскычтопту бөлүүнү иштетүү"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Шайкештештирилген дайындарыңыз Google\'дан жок кылынат"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Шайкештештирилген дайындарыңыз жок кылынат. Макулсузбу?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Жок кылуу"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Жокко чыгаруу"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Башка киргзүү ыкмалрна которуу"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Тил которуштуруу баскычында башка киргизүү ыкмалары дагы камтылган"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Тил которуштуруу баскычы"</string>
diff --git a/java/res/values-lt/strings.xml b/java/res/values-lt/strings.xml
index 8815614..d49e14c 100644
--- a/java/res/values-lt/strings.xml
+++ b/java/res/values-lt/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Išplėstiniai"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Įgalinti suskaidytą klaviatūrą"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Ištrinami sinchronizuoti duomenys iš „Google“"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Sinchronizuoti duomenys bus ištrinti. Esate tikri?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Ištrinti"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Atšaukti"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Perj. į kt. įvesties būd."</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Kalbos perjungimo klavišu taip pat perjungiami įvesties būdai"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Kalbos keitimo klavišas"</string>
diff --git a/java/res/values-lv/strings.xml b/java/res/values-lv/strings.xml
index 663f427..ad228ab 100644
--- a/java/res/values-lv/strings.xml
+++ b/java/res/values-lv/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Papildu"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Motīvs"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Iespējot dalīto tastatūru"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Dzēš sinhronizētos datus no Google serveriem"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Sinhronizētie dati tiks dzēsti. Vai esat pārliecināts?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Dzēst"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Atcelt"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Pārsl. uz citām iev. met."</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Valodas pārslēgš. taustiņu var lietot arī citām ievades metodēm."</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Valodas pārslēgšanas taustiņš"</string>
diff --git a/java/res/values-mk-rMK/strings.xml b/java/res/values-mk-rMK/strings.xml
index ba5402a..f8b9d0e 100644
--- a/java/res/values-mk-rMK/strings.xml
+++ b/java/res/values-mk-rMK/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Напредни"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Тема"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Овозможи поделена тастатура"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Ги брише синхронизираните податоци од Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Синхронизираните податоци ќе се избришат. Дали сте сигурни?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Избриши"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Откажи"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Префрли на други влезни методи"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Копчето за менување јазици покрива и други методи на внес"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Копче за промена на јазик"</string>
diff --git a/java/res/values-ml-rIN/strings.xml b/java/res/values-ml-rIN/strings.xml
index 845d04f..acb0676 100644
--- a/java/res/values-ml-rIN/strings.xml
+++ b/java/res/values-ml-rIN/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"വിപുലമായ"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"തീം"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"സ്പ്ലിറ്റ് കീബോർഡ് പ്രവർത്തനക്ഷമമാക്കുക"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"നിങ്ങളുടെ സമന്വയിപ്പിച്ച വിവരം Google-ൽ നിന്ന് ഇല്ലാതാക്കുന്നു"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"നിങ്ങളുടെ സമന്വയിപ്പിച്ച വിവരം ഇല്ലാതാക്കും. തീർച്ചയാണോ?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"ഇല്ലാതാക്കുക"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"റദ്ദാക്കുക"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"മറ്റു ടൈപ്പുചെയ്യൽ രീതികളിലേക്ക് മാറുക"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"ഭാഷ മാറൽ കീയിൽ മറ്റ് ടൈപ്പുചെയ്യൽ രീതികളും ഉൾപ്പെടുന്നു"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"ഭാഷ മാറൽ കീ"</string>
diff --git a/java/res/values-mr-rIN/strings.xml b/java/res/values-mr-rIN/strings.xml
index eb2bea5..5933f82 100644
--- a/java/res/values-mr-rIN/strings.xml
+++ b/java/res/values-mr-rIN/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"प्रगत"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"थीम"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"विभाजित कीबोर्ड सक्षम करा"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Google वरून आपला संकालित केलेला डेटा हटविते"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"आपला संकालित केलेला डेटा हटविला जाईल. आपल्याला खात्री आहे?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"हटवा"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"रद्द करा"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"अन्य इनपुट पद्धतींवर स्विच करा"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"भाषा स्विच की अन्य इनपुट पद्धती देखील समाविष्ट करते"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"भाषा स्विच की"</string>
diff --git a/java/res/values-ms-rMY/strings.xml b/java/res/values-ms-rMY/strings.xml
index a57099a..000006f 100644
--- a/java/res/values-ms-rMY/strings.xml
+++ b/java/res/values-ms-rMY/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Lanjutan"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Dayakan papan kekunci terpisah"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Memadam data disegerak anda dari Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Data disegerak anda akan dipadamkan. Adakah anda pasti?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Padam"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Batal"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Tukar ke kaedah input lain"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Kunci pertukaran bahasa meliputi kaedah masukan lain juga"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Kekunci tukar bahasa"</string>
diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml
index c28c210..968f2a4 100644
--- a/java/res/values-nb/strings.xml
+++ b/java/res/values-nb/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Avansert"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Aktivér delt tastatur"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Sletter de synkroniserte dataene dine fra Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Synkroniserte data blir slettet. Er du sikker?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Slett"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Avbryt"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Bytt inndatametode"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tasten for språkbytte dekker også andre inndatametoder"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Nøkkel for språkskifte"</string>
diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml
index 4a967ac..9e553e4 100644
--- a/java/res/values-nl/strings.xml
+++ b/java/res/values-nl/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Geavanceerd"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Thema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Gesplitst toetsenbord inschakelen"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Hiermee worden uw gesynchroniseerde gegevens verwijderd van Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Uw gesynchroniseerde gegevens worden verwijderd. Weet u het zeker?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Verwijderen"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Annuleren"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Invoermeth. overschakelen"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Schakelknop voor taal ook van toepassing op andere invoermethoden"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Schakelknop voor taal"</string>
diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml
index 9b8fac4..3eeae0c 100644
--- a/java/res/values-pl/strings.xml
+++ b/java/res/values-pl/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Zaawansowane"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Motyw"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Włącz podzieloną klawiaturę"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Usuwa zsynchronizowane dane z Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Na pewno? Zsynchronizowane dane zostaną usunięte."</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Usuń"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Anuluj"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Inne metody wprowadzania"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Klawisz zmiany języka obejmuje też inne metody wprowadzania"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Klawisz zmiany języka"</string>
diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml
index 34c6d1a..6b82da2 100644
--- a/java/res/values-pt-rPT/strings.xml
+++ b/java/res/values-pt-rPT/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Avançadas"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Ativar teclado dividido"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Elimina os seus dados sincronizados do Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Os seus dados sincronizados serão eliminados. Tem a certeza?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Eliminar"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Cancelar"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Mudar p/ outros mét. ent."</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"A tecla de mudança de idioma abrange outros métodos de entrada"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Tecla alterar idioma"</string>
diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml
index 181782c..767d5a6 100644
--- a/java/res/values-pt/strings.xml
+++ b/java/res/values-pt/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Avançadas"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Ativar teclado dividido"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Exclui seus dados sincronizados do Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Seus dados sincronizados serão excluídos. Tem certeza disso?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Excluir"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Cancelar"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Outros métodos de entrada"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"A tecla p/ mudar o idioma também cobre outros métodos de entrada"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Tecla de seleção de idioma"</string>
diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml
index 0529621..340216e 100644
--- a/java/res/values-ro/strings.xml
+++ b/java/res/values-ro/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Setări avansate"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Temă"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Activați tastatura divizată"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Șterge datele sincronizate de pe Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Datele sincronizate vor fi șterse. Sunteți sigur(ă)?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Ștergeți"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Anulați"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Comut. alte metode de introd."</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tasta de comutare între limbi include şi alte metode de introd."</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Tastă comutare limbi"</string>
diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml
index 304f998..b287470 100644
--- a/java/res/values-ru/strings.xml
+++ b/java/res/values-ru/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Дополнительные настройки"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Тема"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Включить разделенную клавиатуру"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Удаление синхронизированных данных из Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Синхронизированные данные будут удалены. Продолжить?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Удалить"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Отмена"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Смена способов ввода"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Клавиша переключения языков также служит для смены способа ввода"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Клавиша смены языка"</string>
diff --git a/java/res/values-si-rLK/strings.xml b/java/res/values-si-rLK/strings.xml
index 27d68c6..e324b92 100644
--- a/java/res/values-si-rLK/strings.xml
+++ b/java/res/values-si-rLK/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"උසස්"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"තේමාව"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"බෙදු යතුරු පුවරුව සබල කරන්න"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"ඔබගේ සමමුහුර්ත කළ දත්ත Google වෙතින් මකා දමයි"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"ඔබගේ සමමුහුර්ත කළ දත්ත මකා දැමෙනු ඇත. ඔබට විශ්වාස ද?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"මකන්න"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"අවලංගු කරන්න"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"වෙනත් ආදාන ක්රම වෙත මාරුවන්න"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"භාෂා මාරු යතුර වෙනත් ආදාන ක්රමද ආවරණය කරයි"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"භාෂා මාරු යතුර"</string>
diff --git a/java/res/values-sk/strings.xml b/java/res/values-sk/strings.xml
index c9ce297..6b5b8d2 100644
--- a/java/res/values-sk/strings.xml
+++ b/java/res/values-sk/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Rozšírené"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Motív"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Povoliť rozdelenie klávesnice"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Odstráni vaše synchronizované údaje zo serverov Googlu"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Vaše synchronizované údaje budú odstránené. Naozaj chcete pokračovať?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Odstrániť"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Zrušiť"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Prepnúť na iné metódy vstupu"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Kláves na prepnutie jazyka pokrýva aj ďalšie metódy vstupu"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Kľúč na prepínanie jazyka"</string>
diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml
index 5aa8105..45cd365 100644
--- a/java/res/values-sl/strings.xml
+++ b/java/res/values-sl/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Dodatno"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Omogoči razdeljeno tipkovnico"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Izbriše sinhronizirane podatke iz Googla"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Sinhronizirani podatki bodo izbrisani. Ste prepričani?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Izbriši"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Prekliči"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Prekl. na drug nač. vnosa"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tipka za preklop jezika, ki vključuje tudi druge načine vnosa"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Tipka za preklop med jeziki"</string>
diff --git a/java/res/values-sr/strings.xml b/java/res/values-sr/strings.xml
index 4c43497..b4e5e84 100644
--- a/java/res/values-sr/strings.xml
+++ b/java/res/values-sr/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Напредно"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Тема"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Омогући подељену тастатуру"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Брише синхронизоване податке са Google-а"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Синхронизовани подаци ће бити избрисани. Јесте ли сигурни?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Избриши"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Откажи"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Пребаци на друге методе уноса"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Тастер за пребацивање језика обухвата и друге методе уноса"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Тастер за пребацивање језика"</string>
diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml
index 396c20e..2d170f9 100644
--- a/java/res/values-sv/strings.xml
+++ b/java/res/values-sv/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Avancerat"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Aktivera delat tangentbord"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Din synkroniserade data raderas från Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Din synkroniserade data raderas. Vill du fortsätta?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Radera"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Avbryt"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Byt till annan inmatning"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Språkbytesknappen omfattar även andra inmatningsmetoder"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Knapp för att byta språk"</string>
diff --git a/java/res/values-sw/strings.xml b/java/res/values-sw/strings.xml
index c24c900..b14c5fb 100644
--- a/java/res/values-sw/strings.xml
+++ b/java/res/values-sw/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Mahiri"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Mandhari"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Washa muundo wa kibodi inayogawanyika"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Hufuta data yako iliyosawazishwa kutoka Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Data yako iliyosawazishwa itafutwa. Je, una uhakika?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Futa"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Ghairi"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Badilisha hadi kwa mbinu zingine za ingizo"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Ufunguo wa kubadilisha lugha unashughulikia mbinu zingine za ingizo pia"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Kitufe cha kubadilisha lugha"</string>
diff --git a/java/res/values-ta-rIN/strings.xml b/java/res/values-ta-rIN/strings.xml
index 8e208b1..9313ae8 100644
--- a/java/res/values-ta-rIN/strings.xml
+++ b/java/res/values-ta-rIN/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"மேம்பட்டவை"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"தீம்"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"பிரிக்கப்பட்ட விசைப்பலகையை இயக்கு"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Google இலிருந்து உங்கள் ஒத்திசைத்த தரவை நீக்கும்"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"ஒத்திசைத்த தரவு நீக்கப்படும். நீக்கவா?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"நீக்கு"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"ரத்துசெய்"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"பிற உள்ளீட்டு முறைகளுக்கு மாறு"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"மொழி மாற்றல் விசை பிற உள்ளீட்டு முறைகளையும் கட்டுப்படுத்துகிறது"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"மொழி மாற்ற விசை"</string>
diff --git a/java/res/values-te-rIN/strings.xml b/java/res/values-te-rIN/strings.xml
index 4d891a9..24e3f89 100644
--- a/java/res/values-te-rIN/strings.xml
+++ b/java/res/values-te-rIN/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"అధునాతనం"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"థీమ్"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"విభజన కీబోర్డ్ను ప్రారంభించు"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"మీ సమకాలీకృత డేటాను Google నుండి తొలగిస్తుంది"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"మీ సమకాలీకృత డేటా తొలగించబడుతుంది. మీరు ఖచ్చితంగా చేయాలనుకుంటున్నారా?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"తొలగించు"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"రద్దు చేయి"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"ఇతర ఇన్పుట్ పద్ధతులకు మారండి"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"భాష మార్పు కీ ఇతర ఇన్పుట్ పద్ధతులను కూడా కవర్ చేస్తుంది"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"భాష మార్పు కీ"</string>
diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml
index d1580ba..bd2dc43 100644
--- a/java/res/values-th/strings.xml
+++ b/java/res/values-th/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"ขั้นสูง"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"ธีม"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"เปิดใช้แป้นพิมพ์แยก"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"ลบข้อมูลที่ซิงค์ออกจาก Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"ระบบจะลบข้อมูลที่ซิงค์ คุณแน่ใจไหม"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"ลบ"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"ยกเลิก"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"ใช้วิธีการป้อนข้อมูลอื่น"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"แป้นสลับภาษาครอบคลุมวิธีการป้อนข้อมูลอื่นๆ ด้วย"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"แป้นสลับภาษา"</string>
diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml
index 1ebf4c3..6350fcb 100644
--- a/java/res/values-tl/strings.xml
+++ b/java/res/values-tl/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Advanced"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"I-enable ang split keyboard"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Dine-delete ang iyong naka-sync na data sa Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Made-delete ang iyong naka-sync na data. Sigurado ka ba?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"I-delete"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Kanselahin"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Lipat iba paraan ng input"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Saklaw din ng key ng pagpalit ng wika ang ibang paraan ng input"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Key ng panlipat ng wika"</string>
diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml
index 340a417..83e1930 100644
--- a/java/res/values-tr/strings.xml
+++ b/java/res/values-tr/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Gelişmiş"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Bölünmüş klavyeyi etkinleştir"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Senkronize edilmiş verilerinizi Google\'dan siler"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Senkronize edilmiş verileriniz silinecek. Bundan emin misiniz?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Sil"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"İptal"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Diğer giriş yöntemine geç"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Dil geçiş tuşu diğer giriş yöntemlerini de kapsar"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Dil değiştirme tuşu"</string>
diff --git a/java/res/values-uk/strings.xml b/java/res/values-uk/strings.xml
index dd1e068..ff31cf1 100644
--- a/java/res/values-uk/strings.xml
+++ b/java/res/values-uk/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Додатково"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Тема"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Увімкнути розділену клавіатуру"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Видаляє з Google ваші синхронізовані дані"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Ваші синхронізовані дані буде видалено. Справді видалити?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Видалити"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Скасувати"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Інші методи введення"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Клавіша зміни мови дозволяє змінювати методи введення"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Клавіша зміни мови"</string>
diff --git a/java/res/values-ur-rPK/strings.xml b/java/res/values-ur-rPK/strings.xml
index 4827eb9e..b404908 100644
--- a/java/res/values-ur-rPK/strings.xml
+++ b/java/res/values-ur-rPK/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"جدید ترین"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"تھیم"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"الگ ہونے والا کی بورڈ فعال کریں"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Google سے آپ کے مطابقت پذیر ڈیٹا کو حذف کر دیتا ہے"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"آپ کا مطابقت پذیر ڈیٹا حذف ہو جائے گا۔ کیا آپ تیار ہیں؟"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"حذف کریں"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"منسوخ کریں"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"دیگر اندراج طریقوں پر سوئچ کریں"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"زبان سوئچ کرنے کی کلید اندراج کے دیگر طریقوں کا بھی احاطہ کرتی ہے"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"زبان سوئچ کرنے کی کلید"</string>
diff --git a/java/res/values-uz-rUZ/strings.xml b/java/res/values-uz-rUZ/strings.xml
index 4021408..0c16876 100644
--- a/java/res/values-uz-rUZ/strings.xml
+++ b/java/res/values-uz-rUZ/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Qo‘shimcha"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Mavzu"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Ikkiga ajratiladigan klaviaturani yoqish"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Google xizmatlaridagi sinxronlangan ma’lumotlaringizni o‘chirib tashlaydi"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Sinxronlangan ma’lumotlaringiz o‘chirib tashlanadi. Davom etsinmi?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"O‘chirish"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Bekor qilish"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Boshqa usullarga o‘tish"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tilni o‘zgartirish tugmasi matn kiritish usulini ham o‘zgartiradi"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Tilni o‘zgartirish tugmasi"</string>
diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml
index 104a9dd..1d160df 100644
--- a/java/res/values-vi/strings.xml
+++ b/java/res/values-vi/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"Nâng cao"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"Chủ đề"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"Bật chia bàn phím"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"Xóa dữ liệu đã được đồng bộ hóa của bạn khỏi Google"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"Dữ liệu đã được đồng bộ hóa của bạn sẽ bị xóa. Bạn có chắc chắn không?"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"Xóa"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"Hủy"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Phương thức nhập khác"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Khóa chuyển ngôn ngữ bao gồm cả các phương thức nhập liệu khác"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Phím chuyển đổi ngôn ngữ"</string>
diff --git a/java/res/values-zh-rHK/strings.xml b/java/res/values-zh-rHK/strings.xml
index 3e8d405..ac656f7 100644
--- a/java/res/values-zh-rHK/strings.xml
+++ b/java/res/values-zh-rHK/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"進階"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"主題背景"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"啟用分離式鍵盤"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"刪除您來自 Google 的同步處理資料"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"您的同步處理資料將被刪除，確定嗎？"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"刪除"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"取消"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"切換至其他輸入法"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"語言切換鍵包括其他輸入法"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"語言切換鍵"</string>
diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml
index 2be37d5..a704577 100644
--- a/java/res/values-zh-rTW/strings.xml
+++ b/java/res/values-zh-rTW/strings.xml
@@ -35,14 +35,10 @@
<string name="settings_screen_advanced" msgid="7472408607625972994">"進階"</string>
<string name="settings_screen_theme" msgid="2137262503543943871">"主題"</string>
<string name="enable_split_keyboard" msgid="4177264923999493614">"啟用分離式鍵盤"</string>
- <!-- no translation found for clear_sync_data_summary (993477139012576584) -->
- <skip />
- <!-- no translation found for clear_sync_data_confirmation (6415032621884042784) -->
- <skip />
- <!-- no translation found for clear_sync_data_ok (613104067705915132) -->
- <skip />
- <!-- no translation found for clear_sync_data_cancel (8543925137765830060) -->
- <skip />
+ <string name="clear_sync_data_summary" msgid="993477139012576584">"將已同步處理的資料從 Google 刪除"</string>
+ <string name="clear_sync_data_confirmation" msgid="6415032621884042784">"您已同步處理的資料將會刪除，確定要繼續執行這個動作嗎？"</string>
+ <string name="clear_sync_data_ok" msgid="613104067705915132">"刪除"</string>
+ <string name="clear_sync_data_cancel" msgid="8543925137765830060">"取消"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"切換到其他輸入法"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"使語言切換鍵包含其他輸入法"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"語言切換鍵"</string>
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 4c24988..9dc57e3 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -34,7 +34,6 @@
import com.android.inputmethod.latin.LatinIME;
import com.android.inputmethod.latin.R;
import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.SubtypeSwitcher;
import com.android.inputmethod.latin.WordComposer;
import com.android.inputmethod.latin.define.ProductionFlags;
import com.android.inputmethod.latin.settings.Settings;
@@ -50,8 +49,6 @@
NetworkConnectivityUtils.NetworkStateChangeListener {
private static final String TAG = KeyboardSwitcher.class.getSimpleName();
- private SubtypeSwitcher mSubtypeSwitcher;
-
private InputView mCurrentInputView;
private View mMainKeyboardFrame;
private MainKeyboardView mKeyboardView;
@@ -86,7 +83,6 @@
private void initInternal(final LatinIME latinIme) {
mLatinIME = latinIme;
mRichImm = RichInputMethodManager.getInstance();
- mSubtypeSwitcher = SubtypeSwitcher.getInstance();
mState = new KeyboardState(this);
mIsHardwareAcceleratedDrawingEnabled =
InputMethodServiceCompatUtils.enableHardwareAcceleration(mLatinIME);
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 25a7d9f..e8eda46 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -166,7 +166,6 @@
private RichInputMethodManager mRichImm;
@UsedForTesting final KeyboardSwitcher mKeyboardSwitcher;
- final SubtypeSwitcher mSubtypeSwitcher;
private final SubtypeState mSubtypeState = new SubtypeState();
private final EmojiAltPhysicalKeyDetector mEmojiAltPhysicalKeyDetector =
new EmojiAltPhysicalKeyDetector();
@@ -563,7 +562,6 @@
public LatinIME() {
super();
mSettings = Settings.getInstance();
- mSubtypeSwitcher = SubtypeSwitcher.getInstance();
mKeyboardSwitcher = KeyboardSwitcher.getInstance();
mStatsUtilsManager = StatsUtilsManager.getInstance();
mIsHardwareAcceleratedDrawingEnabled =
@@ -577,7 +575,6 @@
DebugFlags.init(PreferenceManager.getDefaultSharedPreferences(this));
RichInputMethodManager.init(this);
mRichImm = RichInputMethodManager.getInstance();
- SubtypeSwitcher.init(this);
KeyboardSwitcher.init(this);
AudioAndHapticFeedbackManager.init(this);
AccessibilityUtils.init(this);
@@ -877,7 +874,6 @@
// Note that the calling sequence of onCreate() and onCurrentInputMethodSubtypeChanged()
// is not guaranteed. It may even be called at the same time on a different thread.
mRichImm.onSubtypeChanged(subtype);
- mSubtypeSwitcher.onSubtypeChanged(mRichImm.getCurrentSubtype());
mInputLogic.onSubtypeChanged(SubtypeLocaleUtils.getCombiningRulesExtraValue(subtype),
mSettings.getCurrent());
loadKeyboard();
@@ -894,7 +890,6 @@
// also wouldn't be consuming gesture data.
mGestureConsumer = GestureConsumer.NULL_GESTURE_CONSUMER;
mRichImm.refreshSubtypeCaches();
- mSubtypeSwitcher.onSubtypeChanged(mRichImm.getCurrentSubtype());
final KeyboardSwitcher switcher = mKeyboardSwitcher;
switcher.updateKeyboardTheme();
final MainKeyboardView mainKeyboardView = switcher.getMainKeyboardView();
@@ -956,10 +951,6 @@
Settings.getInstance().getCurrent().mDisplayOrientation,
!isDifferentTextField);
- if (isDifferentTextField) {
- mSubtypeSwitcher.updateParametersOnStartInputView();
- }
-
// The EditorInfo might have a flag that affects fullscreen mode.
// Note: This call should be done by InputMethodService?
updateFullscreenMode();
diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java
index cb1de6b..811af4b 100644
--- a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java
+++ b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java
@@ -36,6 +36,7 @@
import com.android.inputmethod.latin.settings.AdditionalFeaturesSettingUtils;
import com.android.inputmethod.latin.settings.Settings;
import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
+import com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils;
import com.android.inputmethod.latin.utils.NetworkConnectivityUtils;
import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
@@ -69,10 +70,6 @@
private RichInputMethodSubtype mCurrentRichInputMethodSubtype;
private InputMethodInfo mShortcutInputMethodInfo;
private InputMethodSubtype mShortcutSubtype;
- final HashMap<InputMethodInfo, List<InputMethodSubtype>>
- mSubtypeListCacheWithImplicitlySelectedSubtypes = new HashMap<>();
- final HashMap<InputMethodInfo, List<InputMethodSubtype>>
- mSubtypeListCacheWithoutImplicitlySelectedSubtypes = new HashMap<>();
private static final int INDEX_NOT_FOUND = -1;
@@ -234,33 +231,57 @@
private final InputMethodManager mImm;
private final String mImePackageName;
- private InputMethodInfo mCachedValue;
+ private InputMethodInfo mCachedThisImeInfo;
+ private final HashMap<InputMethodInfo, List<InputMethodSubtype>>
+ mCachedSubtypeListWithImplicitlySelected;
+ private final HashMap<InputMethodInfo, List<InputMethodSubtype>>
+ mCachedSubtypeListOnlyExplicitlySelected;
public InputMethodInfoCache(final InputMethodManager imm, final String imePackageName) {
mImm = imm;
mImePackageName = imePackageName;
+ mCachedSubtypeListWithImplicitlySelected = new HashMap<>();
+ mCachedSubtypeListOnlyExplicitlySelected = new HashMap<>();
}
- public synchronized InputMethodInfo get() {
- if (mCachedValue != null) {
- return mCachedValue;
+ public synchronized InputMethodInfo getInputMethodOfThisIme() {
+ if (mCachedThisImeInfo != null) {
+ return mCachedThisImeInfo;
}
for (final InputMethodInfo imi : mImm.getInputMethodList()) {
if (imi.getPackageName().equals(mImePackageName)) {
- mCachedValue = imi;
+ mCachedThisImeInfo = imi;
return imi;
}
}
throw new RuntimeException("Input method id for " + mImePackageName + " not found.");
}
+ public synchronized List<InputMethodSubtype> getEnabledInputMethodSubtypeList(
+ final InputMethodInfo imi, final boolean allowsImplicitlySelectedSubtypes) {
+ final HashMap<InputMethodInfo, List<InputMethodSubtype>> cache =
+ allowsImplicitlySelectedSubtypes
+ ? mCachedSubtypeListWithImplicitlySelected
+ : mCachedSubtypeListOnlyExplicitlySelected;
+ final List<InputMethodSubtype> cachedList = cache.get(imi);
+ if (cachedList != null) {
+ return cachedList;
+ }
+ final List<InputMethodSubtype> result = mImm.getEnabledInputMethodSubtypeList(
+ imi, allowsImplicitlySelectedSubtypes);
+ cache.put(imi, result);
+ return result;
+ }
+
public synchronized void clear() {
- mCachedValue = null;
+ mCachedThisImeInfo = null;
+ mCachedSubtypeListWithImplicitlySelected.clear();
+ mCachedSubtypeListOnlyExplicitlySelected.clear();
}
}
public InputMethodInfo getInputMethodInfoOfThisIme() {
- return mInputMethodInfoCache.get();
+ return mInputMethodInfoCache.getInputMethodOfThisIme();
}
public String getInputMethodIdOfThisIme() {
@@ -445,21 +466,11 @@
private List<InputMethodSubtype> getEnabledInputMethodSubtypeList(final InputMethodInfo imi,
final boolean allowsImplicitlySelectedSubtypes) {
- final HashMap<InputMethodInfo, List<InputMethodSubtype>> cache =
- allowsImplicitlySelectedSubtypes
- ? mSubtypeListCacheWithImplicitlySelectedSubtypes
- : mSubtypeListCacheWithoutImplicitlySelectedSubtypes;
- final List<InputMethodSubtype> cachedList = cache.get(imi);
- if (null != cachedList) return cachedList;
- final List<InputMethodSubtype> result = mImmWrapper.mImm.getEnabledInputMethodSubtypeList(
+ return mInputMethodInfoCache.getEnabledInputMethodSubtypeList(
imi, allowsImplicitlySelectedSubtypes);
- cache.put(imi, result);
- return result;
}
public void refreshSubtypeCaches() {
- mSubtypeListCacheWithImplicitlySelectedSubtypes.clear();
- mSubtypeListCacheWithoutImplicitlySelectedSubtypes.clear();
mInputMethodInfoCache.clear();
updateCurrentSubtype(mImmWrapper.mImm.getCurrentInputMethodSubtype());
updateShortcutIme();
@@ -513,6 +524,15 @@
+ (mShortcutSubtype == null ? "<null>" : (
mShortcutSubtype.getLocale() + ", " + mShortcutSubtype.getMode())));
}
+ final RichInputMethodSubtype richSubtype = mCurrentRichInputMethodSubtype;
+ final boolean implicitlyEnabledSubtype = checkIfSubtypeBelongsToThisImeAndImplicitlyEnabled(
+ richSubtype.getRawSubtype());
+ final Locale systemLocale = mContext.getResources().getConfiguration().locale;
+ LanguageOnSpacebarUtils.onSubtypeChanged(
+ richSubtype, implicitlyEnabledSubtype, systemLocale);
+ LanguageOnSpacebarUtils.setEnabledSubtypes(getMyEnabledInputMethodSubtypeList(
+ true /* allowsImplicitlySelectedSubtypes */));
+
// TODO: Update an icon for shortcut IME
final Map<InputMethodInfo, List<InputMethodSubtype>> shortcuts =
getInputMethodManager().getShortcutInputMethodsAndSubtypes();
diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
deleted file mode 100644
index d7a03d4..0000000
--- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.inputmethod.latin;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.view.inputmethod.InputMethodSubtype;
-
-import com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
-
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
-public final class SubtypeSwitcher {
- private static final SubtypeSwitcher sInstance = new SubtypeSwitcher();
-
- private /* final */ RichInputMethodManager mRichImm;
- private /* final */ Resources mResources;
-
- public static SubtypeSwitcher getInstance() {
- return sInstance;
- }
-
- public static void init(final Context context) {
- SubtypeLocaleUtils.init(context);
- RichInputMethodManager.init(context);
- sInstance.initialize(context);
- }
-
- private SubtypeSwitcher() {
- // Intentional empty constructor for singleton.
- }
-
- private void initialize(final Context context) {
- if (mResources != null) {
- return;
- }
- mResources = context.getResources();
- mRichImm = RichInputMethodManager.getInstance();
-
- onSubtypeChanged(mRichImm.getCurrentSubtype());
- updateParametersOnStartInputView();
- }
-
- /**
- * Update parameters which are changed outside LatinIME. This parameters affect UI so that they
- * should be updated every time onStartInputView is called.
- */
- public void updateParametersOnStartInputView() {
- final List<InputMethodSubtype> enabledSubtypesOfThisIme =
- mRichImm.getMyEnabledInputMethodSubtypeList(true);
- LanguageOnSpacebarUtils.setEnabledSubtypes(enabledSubtypesOfThisIme);
- }
-
- // Update the current subtype. LatinIME.onCurrentInputMethodSubtypeChanged calls this function.
- public void onSubtypeChanged(@Nonnull final RichInputMethodSubtype richSubtype) {
- final boolean implicitlyEnabledSubtype = mRichImm
- .checkIfSubtypeBelongsToThisImeAndImplicitlyEnabled(richSubtype.getRawSubtype());
- LanguageOnSpacebarUtils.onSubtypeChanged(
- richSubtype, implicitlyEnabledSubtype, mResources.getConfiguration().locale);
- }
-}
diff --git a/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
index 0232853..8f4ec4f 100644
--- a/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
@@ -33,9 +33,8 @@
import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.SubtypeSwitcher;
-import com.android.inputmethod.latin.accounts.LoginAccountUtils;
import com.android.inputmethod.latin.accounts.AccountStateChangedListener;
+import com.android.inputmethod.latin.accounts.LoginAccountUtils;
import com.android.inputmethod.latin.define.ProductionFlags;
import javax.annotation.Nullable;
@@ -66,12 +65,6 @@
addPreferencesFromResource(R.xml.prefs_screen_accounts);
final Resources res = getResources();
- final Context context = getActivity();
-
- // When we are called from the Settings application but we are not already running, some
- // singleton and utility classes may not have been initialized. We have to call
- // initialization method of these classes here. See {@link LatinIME#onCreate()}.
- SubtypeSwitcher.init(context);
if (ProductionFlags.IS_METRICS_LOGGING_SUPPORTED) {
final Preference enableMetricsLogging =
diff --git a/native/jni/NativeFileList.mk b/native/jni/NativeFileList.mk
index 0be7153..d8b69bf 100644
--- a/native/jni/NativeFileList.mk
+++ b/native/jni/NativeFileList.mk
@@ -20,6 +20,52 @@
jni_common.cpp
LATIN_IME_CORE_SRC_FILES := \
+ $(addprefix dictionary/header/, \
+ header_policy.cpp \
+ header_read_write_utils.cpp) \
+ dictionary/property/ngram_context.cpp \
+ dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp \
+ $(addprefix dictionary/structure/pt_common/, \
+ bigram/bigram_list_read_write_utils.cpp \
+ dynamic_pt_gc_event_listeners.cpp \
+ dynamic_pt_reading_helper.cpp \
+ dynamic_pt_reading_utils.cpp \
+ dynamic_pt_updating_helper.cpp \
+ dynamic_pt_writing_utils.cpp \
+ patricia_trie_reading_utils.cpp \
+ shortcut/shortcut_list_reading_utils.cpp) \
+ $(addprefix dictionary/structure/v2/, \
+ patricia_trie_policy.cpp \
+ ver2_patricia_trie_node_reader.cpp \
+ ver2_pt_node_array_reader.cpp) \
+ $(addprefix dictionary/structure/v4/, \
+ ver4_dict_buffers.cpp \
+ ver4_dict_constants.cpp \
+ ver4_patricia_trie_node_reader.cpp \
+ ver4_patricia_trie_node_writer.cpp \
+ ver4_patricia_trie_policy.cpp \
+ ver4_patricia_trie_reading_utils.cpp \
+ ver4_patricia_trie_writing_helper.cpp \
+ ver4_pt_node_array_reader.cpp) \
+ $(addprefix dictionary/structure/v4/content/, \
+ dynamic_language_model_probability_utils.cpp \
+ language_model_dict_content.cpp \
+ language_model_dict_content_global_counters.cpp \
+ shortcut_dict_content.cpp \
+ sparse_table_dict_content.cpp \
+ terminal_position_lookup_table.cpp) \
+ $(addprefix dictionary/utils/, \
+ buffer_with_extendable_buffer.cpp \
+ byte_array_utils.cpp \
+ dict_file_writing_utils.cpp \
+ file_utils.cpp \
+ forgetting_curve_utils.cpp \
+ format_utils.cpp \
+ mmapped_buffer.cpp \
+ multi_bigram_map.cpp \
+ probability_utils.cpp \
+ sparse_table.cpp \
+ trie_map.cpp ) \
suggest/core/suggest.cpp \
$(addprefix suggest/core/dicnode/, \
dic_node.cpp \
@@ -29,8 +75,7 @@
dictionary.cpp \
dictionary_utils.cpp \
digraph_utils.cpp \
- error_type_utils.cpp \
- multi_bigram_map.cpp) \
+ error_type_utils.cpp ) \
$(addprefix suggest/core/layout/, \
additional_proximity_chars.cpp \
proximity_info.cpp \
@@ -39,54 +84,9 @@
proximity_info_state_utils.cpp) \
suggest/core/policy/weighting.cpp \
suggest/core/session/dic_traverse_session.cpp \
- suggest/core/session/ngram_context.cpp \
$(addprefix suggest/core/result/, \
suggestion_results.cpp \
suggestions_output_utils.cpp) \
- $(addprefix suggest/policyimpl/dictionary/, \
- header/header_policy.cpp \
- header/header_read_write_utils.cpp \
- structure/dictionary_structure_with_buffer_policy_factory.cpp) \
- $(addprefix suggest/policyimpl/dictionary/structure/pt_common/, \
- bigram/bigram_list_read_write_utils.cpp \
- dynamic_pt_gc_event_listeners.cpp \
- dynamic_pt_reading_helper.cpp \
- dynamic_pt_reading_utils.cpp \
- dynamic_pt_updating_helper.cpp \
- dynamic_pt_writing_utils.cpp \
- patricia_trie_reading_utils.cpp \
- shortcut/shortcut_list_reading_utils.cpp) \
- $(addprefix suggest/policyimpl/dictionary/structure/v2/, \
- patricia_trie_policy.cpp \
- ver2_patricia_trie_node_reader.cpp \
- ver2_pt_node_array_reader.cpp) \
- $(addprefix suggest/policyimpl/dictionary/structure/v4/, \
- ver4_dict_buffers.cpp \
- ver4_dict_constants.cpp \
- ver4_patricia_trie_node_reader.cpp \
- ver4_patricia_trie_node_writer.cpp \
- ver4_patricia_trie_policy.cpp \
- ver4_patricia_trie_reading_utils.cpp \
- ver4_patricia_trie_writing_helper.cpp \
- ver4_pt_node_array_reader.cpp) \
- $(addprefix suggest/policyimpl/dictionary/structure/v4/content/, \
- dynamic_language_model_probability_utils.cpp \
- language_model_dict_content.cpp \
- language_model_dict_content_global_counters.cpp \
- shortcut_dict_content.cpp \
- sparse_table_dict_content.cpp \
- terminal_position_lookup_table.cpp) \
- $(addprefix suggest/policyimpl/dictionary/utils/, \
- buffer_with_extendable_buffer.cpp \
- byte_array_utils.cpp \
- dict_file_writing_utils.cpp \
- file_utils.cpp \
- forgetting_curve_utils.cpp \
- format_utils.cpp \
- mmapped_buffer.cpp \
- probability_utils.cpp \
- sparse_table.cpp \
- trie_map.cpp ) \
suggest/policyimpl/gesture/gesture_suggest_policy_factory.cpp \
$(addprefix suggest/policyimpl/typing/, \
scoring_params.cpp \
@@ -102,7 +102,7 @@
time_keeper.cpp)
LATIN_IME_CORE_SRC_FILES_BACKWARD_V402 := \
- $(addprefix suggest/policyimpl/dictionary/structure/backward/v402/, \
+ $(addprefix dictionary/structure/backward/v402/, \
ver4_dict_buffers.cpp \
ver4_dict_constants.cpp \
ver4_patricia_trie_node_reader.cpp \
@@ -111,34 +111,34 @@
ver4_patricia_trie_reading_utils.cpp \
ver4_patricia_trie_writing_helper.cpp \
ver4_pt_node_array_reader.cpp) \
- $(addprefix suggest/policyimpl/dictionary/structure/backward/v402/content/, \
+ $(addprefix dictionary/structure/backward/v402/content/, \
bigram_dict_content.cpp \
probability_dict_content.cpp \
shortcut_dict_content.cpp \
sparse_table_dict_content.cpp \
terminal_position_lookup_table.cpp) \
- $(addprefix suggest/policyimpl/dictionary/structure/backward/v402/bigram/, \
+ $(addprefix dictionary/structure/backward/v402/bigram/, \
ver4_bigram_list_policy.cpp)
LATIN_IME_CORE_SRC_FILES += $(LATIN_IME_CORE_SRC_FILES_BACKWARD_V402)
LATIN_IME_CORE_TEST_FILES := \
defines_test.cpp \
+ dictionary/header/header_read_write_utils_test.cpp \
+ dictionary/structure/v4/content/language_model_dict_content_test.cpp \
+ dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp \
+ dictionary/structure/v4/content/probability_entry_test.cpp \
+ dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp \
+ dictionary/utils/bloom_filter_test.cpp \
+ dictionary/utils/buffer_with_extendable_buffer_test.cpp \
+ dictionary/utils/byte_array_utils_test.cpp \
+ dictionary/utils/format_utils_test.cpp \
+ dictionary/utils/probability_utils_test.cpp \
+ dictionary/utils/sparse_table_test.cpp \
+ dictionary/utils/trie_map_test.cpp \
suggest/core/dicnode/dic_node_pool_test.cpp \
- suggest/core/dictionary/bloom_filter_test.cpp \
suggest/core/layout/geometry_utils_test.cpp \
suggest/core/layout/normal_distribution_2d_test.cpp \
- suggest/policyimpl/dictionary/header/header_read_write_utils_test.cpp \
- suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_test.cpp \
- suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp \
- suggest/policyimpl/dictionary/structure/v4/content/probability_entry_test.cpp \
- suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp \
- suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer_test.cpp \
- suggest/policyimpl/dictionary/utils/byte_array_utils_test.cpp \
- suggest/policyimpl/dictionary/utils/format_utils_test.cpp \
- suggest/policyimpl/dictionary/utils/probability_utils_test.cpp \
- suggest/policyimpl/dictionary/utils/sparse_table_test.cpp \
- suggest/policyimpl/dictionary/utils/trie_map_test.cpp \
suggest/policyimpl/utils/damerau_levenshtein_edit_distance_policy_test.cpp \
utils/autocorrection_threshold_utils_test.cpp \
utils/char_utils_test.cpp \
diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
index 8f1e35e..3341e11 100644
--- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
+++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
@@ -22,15 +22,15 @@
#include <vector>
#include "defines.h"
+#include "dictionary/property/unigram_property.h"
+#include "dictionary/property/ngram_context.h"
+#include "dictionary/property/word_property.h"
+#include "dictionary/structure/dictionary_structure_with_buffer_policy_factory.h"
#include "jni.h"
#include "jni_common.h"
#include "suggest/core/dictionary/dictionary.h"
-#include "suggest/core/dictionary/property/unigram_property.h"
-#include "suggest/core/dictionary/property/word_property.h"
#include "suggest/core/result/suggestion_results.h"
-#include "suggest/core/session/ngram_context.h"
#include "suggest/core/suggest_options.h"
-#include "suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h"
#include "utils/char_utils.h"
#include "utils/int_array_view.h"
#include "utils/jni_data_utils.h"
diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionaryUtils.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionaryUtils.cpp
index 68bf417..0885f2d 100644
--- a/native/jni/com_android_inputmethod_latin_BinaryDictionaryUtils.cpp
+++ b/native/jni/com_android_inputmethod_latin_BinaryDictionaryUtils.cpp
@@ -19,9 +19,9 @@
#include "com_android_inputmethod_latin_BinaryDictionaryUtils.h"
#include "defines.h"
+#include "dictionary/utils/dict_file_writing_utils.h"
#include "jni.h"
#include "jni_common.h"
-#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"
#include "utils/autocorrection_threshold_utils.h"
#include "utils/char_utils.h"
#include "utils/jni_data_utils.h"
diff --git a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp
index 3c6bff3..45f5492 100644
--- a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp
+++ b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp
@@ -19,10 +19,10 @@
#include "com_android_inputmethod_latin_DicTraverseSession.h"
#include "defines.h"
+#include "dictionary/property/ngram_context.h"
#include "jni.h"
#include "jni_common.h"
#include "suggest/core/session/dic_traverse_session.h"
-#include "suggest/core/session/ngram_context.h"
namespace latinime {
class Dictionary;
diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.cpp b/native/jni/src/dictionary/header/header_policy.cpp
similarity index 98%
rename from native/jni/src/suggest/policyimpl/dictionary/header/header_policy.cpp
rename to native/jni/src/dictionary/header/header_policy.cpp
index c93f310..d4f84d3 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.cpp
+++ b/native/jni/src/dictionary/header/header_policy.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
+#include "dictionary/header/header_policy.h"
#include <algorithm>
diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h b/native/jni/src/dictionary/header/header_policy.h
similarity index 97%
rename from native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h
rename to native/jni/src/dictionary/header/header_policy.h
index f76931b..47cc919 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h
+++ b/native/jni/src/dictionary/header/header_policy.h
@@ -20,10 +20,10 @@
#include <cstdint>
#include "defines.h"
-#include "suggest/core/policy/dictionary_header_structure_policy.h"
-#include "suggest/policyimpl/dictionary/header/header_read_write_utils.h"
-#include "suggest/policyimpl/dictionary/utils/entry_counters.h"
-#include "suggest/policyimpl/dictionary/utils/format_utils.h"
+#include "dictionary/header/header_read_write_utils.h"
+#include "dictionary/interface/dictionary_header_structure_policy.h"
+#include "dictionary/utils/entry_counters.h"
+#include "dictionary/utils/format_utils.h"
#include "utils/char_utils.h"
#include "utils/time_keeper.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp b/native/jni/src/dictionary/header/header_read_write_utils.cpp
similarity index 97%
rename from native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp
rename to native/jni/src/dictionary/header/header_read_write_utils.cpp
index 19ed0d4..779f8b8 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp
+++ b/native/jni/src/dictionary/header/header_read_write_utils.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/header/header_read_write_utils.h"
+#include "dictionary/header/header_read_write_utils.h"
#include <cctype>
#include <cstdio>
@@ -22,8 +22,8 @@
#include <vector>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/byte_array_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h b/native/jni/src/dictionary/header/header_read_write_utils.h
similarity index 97%
rename from native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h
rename to native/jni/src/dictionary/header/header_read_write_utils.h
index 5dd91b2..f67d614 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h
+++ b/native/jni/src/dictionary/header/header_read_write_utils.h
@@ -20,8 +20,8 @@
#include <cstdint>
#include "defines.h"
-#include "suggest/core/policy/dictionary_header_structure_policy.h"
-#include "suggest/policyimpl/dictionary/utils/format_utils.h"
+#include "dictionary/interface/dictionary_header_structure_policy.h"
+#include "dictionary/utils/format_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/core/policy/dictionary_bigrams_structure_policy.h b/native/jni/src/dictionary/interface/dictionary_bigrams_structure_policy.h
similarity index 100%
rename from native/jni/src/suggest/core/policy/dictionary_bigrams_structure_policy.h
rename to native/jni/src/dictionary/interface/dictionary_bigrams_structure_policy.h
diff --git a/native/jni/src/suggest/core/policy/dictionary_header_structure_policy.h b/native/jni/src/dictionary/interface/dictionary_header_structure_policy.h
similarity index 100%
rename from native/jni/src/suggest/core/policy/dictionary_header_structure_policy.h
rename to native/jni/src/dictionary/interface/dictionary_header_structure_policy.h
diff --git a/native/jni/src/suggest/core/policy/dictionary_shortcuts_structure_policy.h b/native/jni/src/dictionary/interface/dictionary_shortcuts_structure_policy.h
similarity index 100%
rename from native/jni/src/suggest/core/policy/dictionary_shortcuts_structure_policy.h
rename to native/jni/src/dictionary/interface/dictionary_shortcuts_structure_policy.h
diff --git a/native/jni/src/suggest/core/policy/dictionary_structure_with_buffer_policy.h b/native/jni/src/dictionary/interface/dictionary_structure_with_buffer_policy.h
similarity index 94%
rename from native/jni/src/suggest/core/policy/dictionary_structure_with_buffer_policy.h
rename to native/jni/src/dictionary/interface/dictionary_structure_with_buffer_policy.h
index 33a0fbc..ace4849 100644
--- a/native/jni/src/suggest/core/policy/dictionary_structure_with_buffer_policy.h
+++ b/native/jni/src/dictionary/interface/dictionary_structure_with_buffer_policy.h
@@ -20,10 +20,10 @@
#include <memory>
#include "defines.h"
-#include "suggest/core/dictionary/binary_dictionary_shortcut_iterator.h"
-#include "suggest/core/dictionary/property/historical_info.h"
-#include "suggest/core/dictionary/property/word_property.h"
-#include "suggest/core/dictionary/word_attributes.h"
+#include "dictionary/property/historical_info.h"
+#include "dictionary/property/word_attributes.h"
+#include "dictionary/property/word_property.h"
+#include "dictionary/utils/binary_dictionary_shortcut_iterator.h"
#include "utils/int_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/core/dictionary/ngram_listener.h b/native/jni/src/dictionary/interface/ngram_listener.h
similarity index 100%
rename from native/jni/src/suggest/core/dictionary/ngram_listener.h
rename to native/jni/src/dictionary/interface/ngram_listener.h
diff --git a/native/jni/src/suggest/core/dictionary/property/historical_info.h b/native/jni/src/dictionary/property/historical_info.h
similarity index 100%
rename from native/jni/src/suggest/core/dictionary/property/historical_info.h
rename to native/jni/src/dictionary/property/historical_info.h
diff --git a/native/jni/src/suggest/core/session/ngram_context.cpp b/native/jni/src/dictionary/property/ngram_context.cpp
similarity index 97%
rename from native/jni/src/suggest/core/session/ngram_context.cpp
rename to native/jni/src/dictionary/property/ngram_context.cpp
index 17ef9ae..7b9c3ef 100644
--- a/native/jni/src/suggest/core/session/ngram_context.cpp
+++ b/native/jni/src/dictionary/property/ngram_context.cpp
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "suggest/core/session/ngram_context.h"
+#include "dictionary/property/ngram_context.h"
-#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
+#include "dictionary/interface/dictionary_structure_with_buffer_policy.h"
#include "utils/char_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/core/session/ngram_context.h b/native/jni/src/dictionary/property/ngram_context.h
similarity index 100%
rename from native/jni/src/suggest/core/session/ngram_context.h
rename to native/jni/src/dictionary/property/ngram_context.h
diff --git a/native/jni/src/suggest/core/dictionary/property/ngram_property.h b/native/jni/src/dictionary/property/ngram_property.h
similarity index 94%
rename from native/jni/src/suggest/core/dictionary/property/ngram_property.h
rename to native/jni/src/dictionary/property/ngram_property.h
index e67b4da..5f259ec 100644
--- a/native/jni/src/suggest/core/dictionary/property/ngram_property.h
+++ b/native/jni/src/dictionary/property/ngram_property.h
@@ -20,8 +20,8 @@
#include <vector>
#include "defines.h"
-#include "suggest/core/dictionary/property/historical_info.h"
-#include "suggest/core/session/ngram_context.h"
+#include "dictionary/property/historical_info.h"
+#include "dictionary/property/ngram_context.h"
namespace latinime {
diff --git a/native/jni/src/suggest/core/dictionary/property/unigram_property.h b/native/jni/src/dictionary/property/unigram_property.h
similarity index 98%
rename from native/jni/src/suggest/core/dictionary/property/unigram_property.h
rename to native/jni/src/dictionary/property/unigram_property.h
index f194f97..92f61b8 100644
--- a/native/jni/src/suggest/core/dictionary/property/unigram_property.h
+++ b/native/jni/src/dictionary/property/unigram_property.h
@@ -20,7 +20,7 @@
#include <vector>
#include "defines.h"
-#include "suggest/core/dictionary/property/historical_info.h"
+#include "dictionary/property/historical_info.h"
namespace latinime {
diff --git a/native/jni/src/suggest/core/dictionary/word_attributes.h b/native/jni/src/dictionary/property/word_attributes.h
similarity index 100%
rename from native/jni/src/suggest/core/dictionary/word_attributes.h
rename to native/jni/src/dictionary/property/word_attributes.h
diff --git a/native/jni/src/suggest/core/dictionary/property/word_property.h b/native/jni/src/dictionary/property/word_property.h
similarity index 93%
rename from native/jni/src/suggest/core/dictionary/property/word_property.h
rename to native/jni/src/dictionary/property/word_property.h
index 9efc7f3..3028e02 100644
--- a/native/jni/src/suggest/core/dictionary/property/word_property.h
+++ b/native/jni/src/dictionary/property/word_property.h
@@ -20,8 +20,8 @@
#include <vector>
#include "defines.h"
-#include "suggest/core/dictionary/property/ngram_property.h"
-#include "suggest/core/dictionary/property/unigram_property.h"
+#include "dictionary/property/ngram_property.h"
+#include "dictionary/property/unigram_property.h"
#include "utils/int_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/Readme.txt b/native/jni/src/dictionary/structure/backward/v402/Readme.txt
similarity index 100%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/Readme.txt
rename to native/jni/src/dictionary/structure/backward/v402/Readme.txt
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.cpp b/native/jni/src/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.cpp
similarity index 93%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.cpp
rename to native/jni/src/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.cpp
index bc0f47f..60749bc 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.cpp
+++ b/native/jni/src/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.cpp
@@ -19,18 +19,18 @@
* Do not edit this file other than updating policy's interface.
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/bigram/ver4_bigram_list_policy.cpp
+ * dictionary/structure/v4/bigram/ver4_bigram_list_policy.cpp
*/
-#include "suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h"
+#include "dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h"
-#include "suggest/core/dictionary/property/ngram_property.h"
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h"
-#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h"
+#include "dictionary/header/header_policy.h"
+#include "dictionary/property/ngram_property.h"
+#include "dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h"
+#include "dictionary/structure/backward/v402/content/bigram_dict_content.h"
+#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
+#include "dictionary/structure/backward/v402/ver4_dict_constants.h"
+#include "dictionary/utils/forgetting_curve_utils.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h b/native/jni/src/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h
similarity index 95%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h
rename to native/jni/src/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h
index aac6f54..58c88ce 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h
+++ b/native/jni/src/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h
@@ -26,8 +26,8 @@
#define LATINIME_BACKWARD_V402_VER4_BIGRAM_LIST_POLICY_H
#include "defines.h"
-#include "suggest/core/policy/dictionary_bigrams_structure_policy.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_entry.h"
+#include "dictionary/interface/dictionary_bigrams_structure_policy.h"
+#include "dictionary/structure/backward/v402/content/bigram_entry.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.cpp b/native/jni/src/dictionary/structure/backward/v402/content/bigram_dict_content.cpp
similarity index 97%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.cpp
rename to native/jni/src/dictionary/structure/backward/v402/content/bigram_dict_content.cpp
index 15ac883..7fa85de 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.cpp
+++ b/native/jni/src/dictionary/structure/backward/v402/content/bigram_dict_content.cpp
@@ -18,12 +18,12 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp
+ * dictionary/structure/v4/content/bigram_dict_content.cpp
*/
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.h"
+#include "dictionary/structure/backward/v402/content/bigram_dict_content.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.h b/native/jni/src/dictionary/structure/backward/v402/content/bigram_dict_content.h
similarity index 91%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.h
rename to native/jni/src/dictionary/structure/backward/v402/content/bigram_dict_content.h
index b554e56..14f334a 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.h
+++ b/native/jni/src/dictionary/structure/backward/v402/content/bigram_dict_content.h
@@ -18,17 +18,17 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.h
+ * dictionary/structure/v4/content/bigram_dict_content.h
*/
#ifndef LATINIME_BACKWARD_V402_BIGRAM_DICT_CONTENT_H
#define LATINIME_BACKWARD_V402_BIGRAM_DICT_CONTENT_H
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_entry.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h"
+#include "dictionary/structure/backward/v402/content/bigram_entry.h"
+#include "dictionary/structure/backward/v402/content/sparse_table_dict_content.h"
+#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
+#include "dictionary/structure/backward/v402/ver4_dict_constants.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_entry.h b/native/jni/src/dictionary/structure/backward/v402/content/bigram_entry.h
similarity index 93%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_entry.h
rename to native/jni/src/dictionary/structure/backward/v402/content/bigram_entry.h
index 480095a..36ad855 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_entry.h
+++ b/native/jni/src/dictionary/structure/backward/v402/content/bigram_entry.h
@@ -18,15 +18,15 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/content/bigram_entry.h
+ * dictionary/structure/v4/content/bigram_entry.h
*/
#ifndef LATINIME_BACKWARD_V402_BIGRAM_ENTRY_H
#define LATINIME_BACKWARD_V402_BIGRAM_ENTRY_H
#include "defines.h"
-#include "suggest/core/dictionary/property/historical_info.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h"
+#include "dictionary/property/historical_info.h"
+#include "dictionary/structure/backward/v402/ver4_dict_constants.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/dict_content.h b/native/jni/src/dictionary/structure/backward/v402/content/dict_content.h
similarity index 94%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/dict_content.h
rename to native/jni/src/dictionary/structure/backward/v402/content/dict_content.h
index 0f2f255..d3b84fa 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/dict_content.h
+++ b/native/jni/src/dictionary/structure/backward/v402/content/dict_content.h
@@ -18,7 +18,7 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/content/dict_content.h
+ * dictionary/structure/v4/content/dict_content.h
*/
#ifndef LATINIME_BACKWARD_V402_DICT_CONTENT_H
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.cpp b/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.cpp
similarity index 92%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.cpp
rename to native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.cpp
index 61ef4aa..b167f0a 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.cpp
+++ b/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.cpp
@@ -18,15 +18,15 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/content/probability_dict_content.cpp
+ * dictionary/structure/v4/content/probability_dict_content.cpp
*/
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.h"
+#include "dictionary/structure/backward/v402/content/probability_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/probability_entry.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/structure/backward/v402/content/probability_entry.h"
+#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
+#include "dictionary/structure/backward/v402/ver4_dict_constants.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.h b/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.h
similarity index 83%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.h
rename to native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.h
index 3734797..464b29f 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.h
+++ b/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.h
@@ -18,17 +18,17 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/content/probability_dict_content.h
+ * dictionary/structure/v4/content/probability_dict_content.h
*/
#ifndef LATINIME_BACKWARD_V402_PROBABILITY_DICT_CONTENT_H
#define LATINIME_BACKWARD_V402_PROBABILITY_DICT_CONTENT_H
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/single_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/structure/backward/v402/content/single_dict_content.h"
+#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
+#include "dictionary/structure/backward/v402/ver4_dict_constants.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_entry.h b/native/jni/src/dictionary/structure/backward/v402/content/probability_entry.h
similarity index 92%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_entry.h
rename to native/jni/src/dictionary/structure/backward/v402/content/probability_entry.h
index 4111a49..94e36bf 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_entry.h
+++ b/native/jni/src/dictionary/structure/backward/v402/content/probability_entry.h
@@ -18,15 +18,15 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h
+ * dictionary/structure/v4/content/probability_entry.h
*/
#ifndef LATINIME_BACKWARD_V402_PROBABILITY_ENTRY_H
#define LATINIME_BACKWARD_V402_PROBABILITY_ENTRY_H
#include "defines.h"
-#include "suggest/core/dictionary/property/historical_info.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h"
+#include "dictionary/property/historical_info.h"
+#include "dictionary/structure/backward/v402/ver4_dict_constants.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.cpp b/native/jni/src/dictionary/structure/backward/v402/content/shortcut_dict_content.cpp
similarity index 96%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.cpp
rename to native/jni/src/dictionary/structure/backward/v402/content/shortcut_dict_content.cpp
index 56bc8b9..e538a02 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.cpp
+++ b/native/jni/src/dictionary/structure/backward/v402/content/shortcut_dict_content.cpp
@@ -18,12 +18,12 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.cpp
+ * dictionary/structure/v4/content/shortcut_dict_content.cpp
*/
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.h"
+#include "dictionary/structure/backward/v402/content/shortcut_dict_content.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.h b/native/jni/src/dictionary/structure/backward/v402/content/shortcut_dict_content.h
similarity index 91%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.h
rename to native/jni/src/dictionary/structure/backward/v402/content/shortcut_dict_content.h
index 179cec5..3b725e8 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.h
+++ b/native/jni/src/dictionary/structure/backward/v402/content/shortcut_dict_content.h
@@ -18,16 +18,16 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h
+ * dictionary/structure/v4/content/shortcut_dict_content.h
*/
#ifndef LATINIME_BACKWARD_V402_SHORTCUT_DICT_CONTENT_H
#define LATINIME_BACKWARD_V402_SHORTCUT_DICT_CONTENT_H
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h"
+#include "dictionary/structure/backward/v402/content/sparse_table_dict_content.h"
+#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
+#include "dictionary/structure/backward/v402/ver4_dict_constants.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/single_dict_content.h b/native/jni/src/dictionary/structure/backward/v402/content/single_dict_content.h
similarity index 84%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/single_dict_content.h
rename to native/jni/src/dictionary/structure/backward/v402/content/single_dict_content.h
index 49f4468..89df2a1 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/single_dict_content.h
+++ b/native/jni/src/dictionary/structure/backward/v402/content/single_dict_content.h
@@ -18,18 +18,18 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h
+ * dictionary/structure/v4/content/single_dict_content.h
*/
#ifndef LATINIME_BACKWARD_V402_SINGLE_DICT_CONTENT_H
#define LATINIME_BACKWARD_V402_SINGLE_DICT_CONTENT_H
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"
-#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h"
+#include "dictionary/structure/backward/v402/content/dict_content.h"
+#include "dictionary/structure/backward/v402/ver4_dict_constants.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/dict_file_writing_utils.h"
+#include "dictionary/utils/mmapped_buffer.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.cpp b/native/jni/src/dictionary/structure/backward/v402/content/sparse_table_dict_content.cpp
similarity index 89%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.cpp
rename to native/jni/src/dictionary/structure/backward/v402/content/sparse_table_dict_content.cpp
index 7c9b496..280f0f8 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.cpp
+++ b/native/jni/src/dictionary/structure/backward/v402/content/sparse_table_dict_content.cpp
@@ -18,10 +18,10 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.cpp
+ * dictionary/structure/v4/content/sparse_table_dict_content.cpp
*/
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.h"
+#include "dictionary/structure/backward/v402/content/sparse_table_dict_content.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.h b/native/jni/src/dictionary/structure/backward/v402/content/sparse_table_dict_content.h
similarity index 90%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.h
rename to native/jni/src/dictionary/structure/backward/v402/content/sparse_table_dict_content.h
index 3c626df..4b5af87 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.h
+++ b/native/jni/src/dictionary/structure/backward/v402/content/sparse_table_dict_content.h
@@ -18,19 +18,19 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h
+ * dictionary/structure/v4/content/sparse_table_dict_content.h
*/
#ifndef LATINIME_BACKWARD_V402_SPARSE_TABLE_DICT_CONTENT_H
#define LATINIME_BACKWARD_V402_SPARSE_TABLE_DICT_CONTENT_H
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"
-#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/sparse_table.h"
+#include "dictionary/structure/backward/v402/content/dict_content.h"
+#include "dictionary/structure/backward/v402/ver4_dict_constants.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/dict_file_writing_utils.h"
+#include "dictionary/utils/mmapped_buffer.h"
+#include "dictionary/utils/sparse_table.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp b/native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp
similarity index 91%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp
rename to native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp
index a9f8417..30b72bb 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp
+++ b/native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp
@@ -18,13 +18,13 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.cpp
+ * dictionary/structure/v4/content/terminal_position_lookup_table.cpp
*/
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
+#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h b/native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h
similarity index 88%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h
rename to native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h
index eadfe0f..641c749 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h
+++ b/native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h
@@ -18,7 +18,7 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h
+ * dictionary/structure/v4/content/terminal_position_lookup_table.h
*/
#ifndef LATINIME_BACKWARD_V402_TERMINAL_POSITION_LOOKUP_TABLE_H
@@ -27,8 +27,8 @@
#include <unordered_map>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/single_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h"
+#include "dictionary/structure/backward/v402/content/single_dict_content.h"
+#include "dictionary/structure/backward/v402/ver4_dict_constants.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h b/native/jni/src/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h
similarity index 90%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h
rename to native/jni/src/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h
index 941fda7..8cda8c5 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h
+++ b/native/jni/src/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h
@@ -19,17 +19,17 @@
* Do not edit this file other than updating policy's interface.
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h
+ * dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h
*/
#ifndef LATINIME_BACKWARD_V402_VER4_SHORTCUT_LIST_POLICY_H
#define LATINIME_BACKWARD_V402_VER4_SHORTCUT_LIST_POLICY_H
#include "defines.h"
-#include "suggest/core/policy/dictionary_shortcuts_structure_policy.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
+#include "dictionary/interface/dictionary_shortcuts_structure_policy.h"
+#include "dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h"
+#include "dictionary/structure/backward/v402/content/shortcut_dict_content.h"
+#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_buffers.cpp
similarity index 95%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.cpp
rename to native/jni/src/dictionary/structure/backward/v402/ver4_dict_buffers.cpp
index 3dfbd1c..4a9704f 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.cpp
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_buffers.cpp
@@ -18,18 +18,18 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.cpp
+ * dictionary/structure/v4/ver4_dict_buffers.cpp
*/
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h"
+#include "dictionary/structure/backward/v402/ver4_dict_buffers.h"
#include <cerrno>
#include <cstring>
#include <sys/stat.h>
#include <sys/types.h>
-#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"
-#include "suggest/policyimpl/dictionary/utils/file_utils.h"
+#include "dictionary/utils/dict_file_writing_utils.h"
+#include "dictionary/utils/file_utils.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_buffers.h
similarity index 86%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h
rename to native/jni/src/dictionary/structure/backward/v402/ver4_dict_buffers.h
index e775be5..0d09fee 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_buffers.h
@@ -18,7 +18,7 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h
+ * dictionary/structure/v4/ver4_dict_buffers.h
*/
#ifndef LATINIME_BACKWARD_V402_VER4_DICT_BUFFER_H
@@ -27,14 +27,14 @@
#include <memory>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h"
+#include "dictionary/header/header_policy.h"
+#include "dictionary/structure/backward/v402/content/bigram_dict_content.h"
+#include "dictionary/structure/backward/v402/content/probability_dict_content.h"
+#include "dictionary/structure/backward/v402/content/shortcut_dict_content.h"
+#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
+#include "dictionary/structure/backward/v402/ver4_dict_constants.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/mmapped_buffer.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_constants.cpp
similarity index 95%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.cpp
rename to native/jni/src/dictionary/structure/backward/v402/ver4_dict_constants.cpp
index 81d85f4..2948d07 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.cpp
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_constants.cpp
@@ -18,10 +18,10 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp
+ * dictionary/structure/v4/ver4_dict_constants.cpp
*/
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h"
+#include "dictionary/structure/backward/v402/ver4_dict_constants.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_constants.h
similarity index 97%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h
rename to native/jni/src/dictionary/structure/backward/v402/ver4_dict_constants.h
index 88ebd6a..15581d8 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_constants.h
@@ -18,7 +18,7 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h
+ * dictionary/structure/v4/ver4_dict_constants.h
*/
#ifndef LATINIME_BACKWARD_V402_VER4_DICT_CONSTANTS_H
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.cpp
similarity index 83%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.cpp
rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.cpp
index 5c639b1..871ef7a 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.cpp
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.cpp
@@ -18,19 +18,19 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp
+ * dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp
*/
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h"
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/probability_entry.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h"
+#include "dictionary/header/header_policy.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
+#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h"
+#include "dictionary/structure/backward/v402/content/probability_dict_content.h"
+#include "dictionary/structure/backward/v402/content/probability_entry.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/forgetting_curve_utils.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h
similarity index 91%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h
rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h
index 1999a51..367d6f9 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h
@@ -18,15 +18,15 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h
+ * dictionary/structure/v4/ver4_patricia_trie_node_reader.h
*/
#ifndef LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_NODE_READER_H
#define LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_NODE_READER_H
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h"
+#include "dictionary/structure/pt_common/pt_node_params.h"
+#include "dictionary/structure/pt_common/pt_node_reader.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp
similarity index 94%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp
rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp
index d558b94..e3ab5ec 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp
@@ -18,23 +18,23 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp
+ * dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp
*/
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h"
-#include "suggest/core/dictionary/property/unigram_property.h"
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/probability_entry.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h"
+#include "dictionary/header/header_policy.h"
+#include "dictionary/property/unigram_property.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
+#include "dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
+#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h"
+#include "dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h"
+#include "dictionary/structure/backward/v402/content/probability_entry.h"
+#include "dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h"
+#include "dictionary/structure/backward/v402/ver4_dict_buffers.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/forgetting_curve_utils.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h
similarity index 93%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h
rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h
index d0bab50..db3cea1 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h
@@ -18,17 +18,17 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h
+ * dictionary/structure/v4/ver4_patricia_trie_node_writer.h
*/
#ifndef LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_NODE_WRITER_H
#define LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_NODE_WRITER_H
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/probability_entry.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
+#include "dictionary/structure/pt_common/pt_node_params.h"
+#include "dictionary/structure/pt_common/pt_node_writer.h"
+#include "dictionary/structure/backward/v402/content/probability_entry.h"
#include "utils/int_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp
similarity index 96%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp
rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp
index 051aed4..6fb9cff 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp
@@ -19,25 +19,25 @@
* Do not edit this file other than updating policy's interface.
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp
+ * dictionary/structure/v4/ver4_patricia_trie_policy.cpp
*/
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_policy.h"
#include <vector>
#include "suggest/core/dicnode/dic_node.h"
#include "suggest/core/dicnode/dic_node_vector.h"
-#include "suggest/core/dictionary/multi_bigram_map.h"
-#include "suggest/core/dictionary/ngram_listener.h"
-#include "suggest/core/dictionary/property/ngram_property.h"
-#include "suggest/core/dictionary/property/unigram_property.h"
-#include "suggest/core/dictionary/property/word_property.h"
-#include "suggest/core/session/ngram_context.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h"
-#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h"
-#include "suggest/policyimpl/dictionary/utils/probability_utils.h"
+#include "dictionary/interface/ngram_listener.h"
+#include "dictionary/property/ngram_context.h"
+#include "dictionary/property/ngram_property.h"
+#include "dictionary/property/unigram_property.h"
+#include "dictionary/property/word_property.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h"
+#include "dictionary/utils/forgetting_curve_utils.h"
+#include "dictionary/utils/multi_bigram_map.h"
+#include "dictionary/utils/probability_utils.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h
similarity index 83%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h
rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h
index 80b1111..bce5f6b 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h
@@ -19,7 +19,7 @@
* Do not edit this file other than updating policy's interface.
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.h
+ * dictionary/structure/v4/ver4_patricia_trie_policy.h
*/
#ifndef LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_POLICY_H
@@ -28,20 +28,20 @@
#include <vector>
#include "defines.h"
-#include "suggest/core/dictionary/binary_dictionary_bigrams_iterator.h"
-#include "suggest/core/dictionary/binary_dictionary_shortcut_iterator.h"
-#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/entry_counters.h"
+#include "dictionary/header/header_policy.h"
+#include "dictionary/interface/dictionary_structure_with_buffer_policy.h"
+#include "dictionary/structure/pt_common/dynamic_pt_updating_helper.h"
+#include "dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h"
+#include "dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h"
+#include "dictionary/structure/backward/v402/ver4_dict_buffers.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h"
+#include "dictionary/structure/backward/v402/ver4_pt_node_array_reader.h"
+#include "dictionary/utils/binary_dictionary_bigrams_iterator.h"
+#include "dictionary/utils/binary_dictionary_shortcut_iterator.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/entry_counters.h"
#include "utils/int_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.cpp
similarity index 80%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.cpp
rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.cpp
index 80d5311..b8a4cf8 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.cpp
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.cpp
@@ -18,12 +18,12 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp
+ * dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp
*/
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h"
-#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h"
+#include "dictionary/utils/byte_array_utils.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h
similarity index 94%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h
rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h
index 3579c26..c3e736b 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h
@@ -18,7 +18,7 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h
+ * dictionary/structure/v4/ver4_patricia_trie_reading_utils.h
*/
#ifndef LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_READING_UTILS_H
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.cpp
similarity index 92%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.cpp
rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.cpp
index 985c168..c0af9ea 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.cpp
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.cpp
@@ -18,25 +18,25 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp
+ * dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp
*/
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h"
#include <cstring>
#include <queue>
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/file_utils.h"
-#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h"
+#include "dictionary/header/header_policy.h"
+#include "dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h"
+#include "dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h"
+#include "dictionary/structure/backward/v402/ver4_dict_buffers.h"
+#include "dictionary/structure/backward/v402/ver4_dict_constants.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h"
+#include "dictionary/structure/backward/v402/ver4_pt_node_array_reader.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/file_utils.h"
+#include "dictionary/utils/forgetting_curve_utils.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h
similarity index 92%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h
rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h
index 1aad33e..f2b8738 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h
@@ -18,16 +18,16 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h
+ * dictionary/structure/v4/ver4_patricia_trie_writing_helper.h
*/
#ifndef LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_WRITING_HELPER_H
#define LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_WRITING_HELPER_H
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
-#include "suggest/policyimpl/dictionary/utils/entry_counters.h"
+#include "dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h"
+#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h"
+#include "dictionary/utils/entry_counters.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_pt_node_array_reader.cpp
similarity index 88%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.cpp
rename to native/jni/src/dictionary/structure/backward/v402/ver4_pt_node_array_reader.cpp
index 537a6d4..d27d708 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.cpp
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_pt_node_array_reader.cpp
@@ -18,14 +18,14 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.cpp
+ * dictionary/structure/v4/ver4_pt_node_array_reader.cpp
*/
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h"
+#include "dictionary/structure/backward/v402/ver4_pt_node_array_reader.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
+#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h b/native/jni/src/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h
similarity index 91%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h
rename to native/jni/src/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h
index 4f80568..0039bf8 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h
+++ b/native/jni/src/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h
@@ -18,14 +18,14 @@
* !!!!! DO NOT EDIT THIS FILE !!!!!
*
* This file was generated from
- * suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h
+ * dictionary/structure/v4/ver4_pt_node_array_reader.h
*/
#ifndef LATINIME_BACKWARD_V402_VER4_PT_NODE_ARRAY_READER_H
#define LATINIME_BACKWARD_V402_VER4_PT_NODE_ARRAY_READER_H
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h"
+#include "dictionary/structure/pt_common/pt_node_array_reader.h"
namespace latinime {
namespace backward {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp b/native/jni/src/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp
similarity index 89%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp
rename to native/jni/src/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp
index 9a9a21b..4470e85 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp
+++ b/native/jni/src/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp
@@ -14,23 +14,23 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h"
+#include "dictionary/structure/dictionary_structure_with_buffer_policy_factory.h"
#include <climits>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
-#include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.h"
-#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"
-#include "suggest/policyimpl/dictionary/utils/file_utils.h"
-#include "suggest/policyimpl/dictionary/utils/format_utils.h"
-#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h"
+#include "dictionary/structure/backward/v402/ver4_dict_buffers.h"
+#include "dictionary/structure/backward/v402/ver4_dict_constants.h"
+#include "dictionary/structure/backward/v402/ver4_patricia_trie_policy.h"
+#include "dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
+#include "dictionary/structure/v2/patricia_trie_policy.h"
+#include "dictionary/structure/v4/ver4_dict_buffers.h"
+#include "dictionary/structure/v4/ver4_dict_constants.h"
+#include "dictionary/structure/v4/ver4_patricia_trie_policy.h"
+#include "dictionary/utils/dict_file_writing_utils.h"
+#include "dictionary/utils/file_utils.h"
+#include "dictionary/utils/format_utils.h"
+#include "dictionary/utils/mmapped_buffer.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h b/native/jni/src/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h
similarity index 90%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h
rename to native/jni/src/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h
index 768454d..b0c04c0 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h
+++ b/native/jni/src/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h
@@ -20,10 +20,10 @@
#include <vector>
#include "defines.h"
-#include "suggest/core/policy/dictionary_header_structure_policy.h"
-#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
-#include "suggest/policyimpl/dictionary/utils/format_utils.h"
-#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h"
+#include "dictionary/interface/dictionary_header_structure_policy.h"
+#include "dictionary/interface/dictionary_structure_with_buffer_policy.h"
+#include "dictionary/utils/format_utils.h"
+#include "dictionary/utils/mmapped_buffer.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.cpp b/native/jni/src/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.cpp
similarity index 93%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.cpp
rename to native/jni/src/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.cpp
index 1b2f857..64f9b66 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.cpp
+++ b/native/jni/src/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.cpp
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h"
+#include "dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h"
-#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/byte_array_utils.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h b/native/jni/src/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h
similarity index 100%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h
rename to native/jni/src/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp
similarity index 93%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp
rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp
index db1a802..b5e2e9d 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp
+++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h"
+#include "dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h"
-#include "suggest/core/policy/dictionary_header_structure_policy.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h"
+#include "dictionary/interface/dictionary_header_structure_policy.h"
+#include "dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
+#include "dictionary/structure/pt_common/pt_node_params.h"
+#include "dictionary/structure/pt_common/pt_node_writer.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h
similarity index 95%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h
rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h
index b8a4a92..8c7ad96 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h
+++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h
@@ -20,9 +20,9 @@
#include <vector>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
+#include "dictionary/structure/pt_common/pt_node_writer.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.cpp b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_helper.cpp
similarity index 98%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.cpp
rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_helper.cpp
index 5e4a4b1..294bc6e 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.cpp
+++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_helper.cpp
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h"
+#include "dictionary/structure/pt_common/pt_node_array_reader.h"
#include "utils/char_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_helper.h
similarity index 98%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h
rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_helper.h
index 21c287f..d8ddc7c 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h
+++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_helper.h
@@ -21,8 +21,8 @@
#include <vector>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h"
+#include "dictionary/structure/pt_common/pt_node_params.h"
+#include "dictionary/structure/pt_common/pt_node_reader.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.cpp b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_utils.cpp
similarity index 94%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.cpp
rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_utils.cpp
index 3586b50..3eb55ed 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.cpp
+++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_utils.cpp
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
#include "defines.h"
-#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h"
+#include "dictionary/utils/byte_array_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_utils.h
similarity index 100%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h
rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_utils.h
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp
similarity index 95%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp
rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp
index e524e86..ccad345 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp
+++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h"
+#include "dictionary/structure/pt_common/dynamic_pt_updating_helper.h"
-#include "suggest/core/dictionary/property/unigram_property.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/property/unigram_property.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
+#include "dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
+#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h"
+#include "dictionary/structure/pt_common/pt_node_reader.h"
+#include "dictionary/structure/pt_common/pt_node_writer.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_updating_helper.h
similarity index 97%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h
rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_updating_helper.h
index db5f6ab..e8cf98c 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h
+++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_updating_helper.h
@@ -18,7 +18,7 @@
#define LATINIME_DYNAMIC_PT_UPDATING_HELPER_H
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
+#include "dictionary/structure/pt_common/pt_node_params.h"
#include "utils/int_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp
similarity index 96%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp
rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp
index 664aeeb..ea760a5 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp
+++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
+#include "dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
#include <cstddef>
#include <cstdint>
#include <cstdlib>
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_writing_utils.h
similarity index 96%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h
rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_writing_utils.h
index 362fbd1..b4817af 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h
+++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_writing_utils.h
@@ -20,7 +20,7 @@
#include <cstddef>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp b/native/jni/src/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp
similarity index 95%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp
rename to native/jni/src/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp
index b8d78bf..e2807c4 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp
+++ b/native/jni/src/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h"
+#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h"
#include "defines.h"
-#include "suggest/core/policy/dictionary_bigrams_structure_policy.h"
-#include "suggest/core/policy/dictionary_shortcuts_structure_policy.h"
-#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h"
+#include "dictionary/interface/dictionary_bigrams_structure_policy.h"
+#include "dictionary/interface/dictionary_shortcuts_structure_policy.h"
+#include "dictionary/utils/byte_array_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h b/native/jni/src/dictionary/structure/pt_common/patricia_trie_reading_utils.h
similarity index 100%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h
rename to native/jni/src/dictionary/structure/pt_common/patricia_trie_reading_utils.h
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h b/native/jni/src/dictionary/structure/pt_common/pt_node_array_reader.h
similarity index 100%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h
rename to native/jni/src/dictionary/structure/pt_common/pt_node_array_reader.h
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h b/native/jni/src/dictionary/structure/pt_common/pt_node_params.h
similarity index 97%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h
rename to native/jni/src/dictionary/structure/pt_common/pt_node_params.h
index e52706e..905deb1 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h
+++ b/native/jni/src/dictionary/structure/pt_common/pt_node_params.h
@@ -20,9 +20,9 @@
#include <cstring>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
+#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h"
+#include "dictionary/structure/v4/ver4_dict_constants.h"
#include "utils/char_utils.h"
#include "utils/int_array_view.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h b/native/jni/src/dictionary/structure/pt_common/pt_node_reader.h
similarity index 93%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h
rename to native/jni/src/dictionary/structure/pt_common/pt_node_reader.h
index 31299a7..15da19e 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h
+++ b/native/jni/src/dictionary/structure/pt_common/pt_node_reader.h
@@ -19,7 +19,7 @@
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
+#include "dictionary/structure/pt_common/pt_node_params.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h b/native/jni/src/dictionary/structure/pt_common/pt_node_writer.h
similarity index 97%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h
rename to native/jni/src/dictionary/structure/pt_common/pt_node_writer.h
index 954db9b..e6cad25 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h
+++ b/native/jni/src/dictionary/structure/pt_common/pt_node_writer.h
@@ -20,7 +20,7 @@
#include <unordered_map>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
+#include "dictionary/structure/pt_common/pt_node_params.h"
#include "utils/int_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp b/native/jni/src/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp
similarity index 92%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp
rename to native/jni/src/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp
index 40b8720..14428ed 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp
+++ b/native/jni/src/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h"
+#include "dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h"
-#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h"
+#include "dictionary/utils/byte_array_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h b/native/jni/src/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h
similarity index 100%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h
rename to native/jni/src/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/bigram/bigram_list_policy.h b/native/jni/src/dictionary/structure/v2/bigram/bigram_list_policy.h
similarity index 91%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/bigram/bigram_list_policy.h
rename to native/jni/src/dictionary/structure/v2/bigram/bigram_list_policy.h
index e260843..25081fa 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/bigram/bigram_list_policy.h
+++ b/native/jni/src/dictionary/structure/v2/bigram/bigram_list_policy.h
@@ -20,8 +20,8 @@
#include <cstdint>
#include "defines.h"
-#include "suggest/core/policy/dictionary_bigrams_structure_policy.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h"
+#include "dictionary/interface/dictionary_bigrams_structure_policy.h"
+#include "dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp b/native/jni/src/dictionary/structure/v2/patricia_trie_policy.cpp
similarity index 97%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp
rename to native/jni/src/dictionary/structure/v2/patricia_trie_policy.cpp
index 1a51aca..4e8b96b 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp
+++ b/native/jni/src/dictionary/structure/v2/patricia_trie_policy.cpp
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h"
+#include "dictionary/structure/v2/patricia_trie_policy.h"
#include "defines.h"
#include "suggest/core/dicnode/dic_node.h"
#include "suggest/core/dicnode/dic_node_vector.h"
-#include "suggest/core/dictionary/binary_dictionary_bigrams_iterator.h"
-#include "suggest/core/dictionary/multi_bigram_map.h"
-#include "suggest/core/dictionary/ngram_listener.h"
-#include "suggest/core/session/ngram_context.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h"
-#include "suggest/policyimpl/dictionary/utils/probability_utils.h"
+#include "dictionary/interface/ngram_listener.h"
+#include "dictionary/property/ngram_context.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
+#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h"
+#include "dictionary/utils/binary_dictionary_bigrams_iterator.h"
+#include "dictionary/utils/multi_bigram_map.h"
+#include "dictionary/utils/probability_utils.h"
#include "utils/char_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h b/native/jni/src/dictionary/structure/v2/patricia_trie_policy.h
similarity index 91%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h
rename to native/jni/src/dictionary/structure/v2/patricia_trie_policy.h
index 8933962..8edfa7d 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h
+++ b/native/jni/src/dictionary/structure/v2/patricia_trie_policy.h
@@ -21,14 +21,14 @@
#include <vector>
#include "defines.h"
-#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
-#include "suggest/policyimpl/dictionary/structure/v2/bigram/bigram_list_policy.h"
-#include "suggest/policyimpl/dictionary/structure/v2/shortcut/shortcut_list_policy.h"
-#include "suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h"
-#include "suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h"
-#include "suggest/policyimpl/dictionary/utils/format_utils.h"
-#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h"
+#include "dictionary/header/header_policy.h"
+#include "dictionary/interface/dictionary_structure_with_buffer_policy.h"
+#include "dictionary/structure/v2/bigram/bigram_list_policy.h"
+#include "dictionary/structure/v2/shortcut/shortcut_list_policy.h"
+#include "dictionary/structure/v2/ver2_patricia_trie_node_reader.h"
+#include "dictionary/structure/v2/ver2_pt_node_array_reader.h"
+#include "dictionary/utils/format_utils.h"
+#include "dictionary/utils/mmapped_buffer.h"
#include "utils/byte_array_view.h"
#include "utils/int_array_view.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/shortcut/shortcut_list_policy.h b/native/jni/src/dictionary/structure/v2/shortcut/shortcut_list_policy.h
similarity index 93%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/shortcut/shortcut_list_policy.h
rename to native/jni/src/dictionary/structure/v2/shortcut/shortcut_list_policy.h
index 5319dd2..995b1ed 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/shortcut/shortcut_list_policy.h
+++ b/native/jni/src/dictionary/structure/v2/shortcut/shortcut_list_policy.h
@@ -20,8 +20,8 @@
#include <cstdint>
#include "defines.h"
-#include "suggest/core/policy/dictionary_shortcuts_structure_policy.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h"
+#include "dictionary/interface/dictionary_shortcuts_structure_policy.h"
+#include "dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp b/native/jni/src/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp
similarity index 91%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp
rename to native/jni/src/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp
index 90d4687..cbb8ead 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp
+++ b/native/jni/src/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h"
+#include "dictionary/structure/v2/ver2_patricia_trie_node_reader.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h"
+#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h b/native/jni/src/dictionary/structure/v2/ver2_patricia_trie_node_reader.h
similarity index 91%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h
rename to native/jni/src/dictionary/structure/v2/ver2_patricia_trie_node_reader.h
index 838d373..dc87c7c 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h
+++ b/native/jni/src/dictionary/structure/v2/ver2_patricia_trie_node_reader.h
@@ -20,8 +20,8 @@
#include <cstdint>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h"
+#include "dictionary/structure/pt_common/pt_node_params.h"
+#include "dictionary/structure/pt_common/pt_node_reader.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.cpp b/native/jni/src/dictionary/structure/v2/ver2_pt_node_array_reader.cpp
similarity index 91%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.cpp
rename to native/jni/src/dictionary/structure/v2/ver2_pt_node_array_reader.cpp
index 72ad1eb..8b9b02d 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.cpp
+++ b/native/jni/src/dictionary/structure/v2/ver2_pt_node_array_reader.cpp
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h"
+#include "dictionary/structure/v2/ver2_pt_node_array_reader.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h"
+#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h b/native/jni/src/dictionary/structure/v2/ver2_pt_node_array_reader.h
similarity index 94%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h
rename to native/jni/src/dictionary/structure/v2/ver2_pt_node_array_reader.h
index 548f36b..32fa96d 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h
+++ b/native/jni/src/dictionary/structure/v2/ver2_pt_node_array_reader.h
@@ -20,7 +20,7 @@
#include <cstdint>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h"
+#include "dictionary/structure/pt_common/pt_node_array_reader.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.cpp b/native/jni/src/dictionary/structure/v4/content/dynamic_language_model_probability_utils.cpp
similarity index 92%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.cpp
rename to native/jni/src/dictionary/structure/v4/content/dynamic_language_model_probability_utils.cpp
index 025ee99..165947f 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.cpp
+++ b/native/jni/src/dictionary/structure/v4/content/dynamic_language_model_probability_utils.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h"
+#include "dictionary/structure/v4/content/dynamic_language_model_probability_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h b/native/jni/src/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h
similarity index 97%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h
rename to native/jni/src/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h
index 644ae2c..71824c9 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h
+++ b/native/jni/src/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h
@@ -20,7 +20,7 @@
#include <algorithm>
#include "defines.h"
-#include "suggest/core/dictionary/property/historical_info.h"
+#include "dictionary/property/historical_info.h"
#include "utils/ngram_utils.h"
#include "utils/time_keeper.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.cpp b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content.cpp
similarity index 98%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.cpp
rename to native/jni/src/dictionary/structure/v4/content/language_model_dict_content.cpp
index 6db7ea4..c10e490 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.cpp
+++ b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content.cpp
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h"
+#include "dictionary/structure/v4/content/language_model_dict_content.h"
#include <algorithm>
#include <cstring>
-#include "suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h"
-#include "suggest/policyimpl/dictionary/utils/probability_utils.h"
+#include "dictionary/structure/v4/content/dynamic_language_model_probability_utils.h"
+#include "dictionary/utils/probability_utils.h"
#include "utils/ngram_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content.h
similarity index 94%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h
rename to native/jni/src/dictionary/structure/v4/content/language_model_dict_content.h
index 9678c35..db8c6e1 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h
+++ b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content.h
@@ -21,13 +21,13 @@
#include <vector>
#include "defines.h"
-#include "suggest/core/dictionary/word_attributes.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
-#include "suggest/policyimpl/dictionary/utils/entry_counters.h"
-#include "suggest/policyimpl/dictionary/utils/trie_map.h"
+#include "dictionary/property/word_attributes.h"
+#include "dictionary/structure/v4/content/language_model_dict_content_global_counters.h"
+#include "dictionary/structure/v4/content/probability_entry.h"
+#include "dictionary/structure/v4/content/terminal_position_lookup_table.h"
+#include "dictionary/structure/v4/ver4_dict_constants.h"
+#include "dictionary/utils/entry_counters.h"
+#include "dictionary/utils/trie_map.h"
#include "utils/byte_array_view.h"
#include "utils/int_array_view.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.cpp b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content_global_counters.cpp
similarity index 86%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.cpp
rename to native/jni/src/dictionary/structure/v4/content/language_model_dict_content_global_counters.cpp
index d6d9188..89cf0e3 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.cpp
+++ b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content_global_counters.cpp
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.h"
+#include "dictionary/structure/v4/content/language_model_dict_content_global_counters.h"
#include <climits>
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
+#include "dictionary/structure/v4/ver4_dict_constants.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.h b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content_global_counters.h
similarity index 95%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.h
rename to native/jni/src/dictionary/structure/v4/content/language_model_dict_content_global_counters.h
index 283c269..3f87c0e 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.h
+++ b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content_global_counters.h
@@ -20,8 +20,8 @@
#include <cstdio>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/dict_file_writing_utils.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h b/native/jni/src/dictionary/structure/v4/content/probability_entry.h
similarity index 96%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h
rename to native/jni/src/dictionary/structure/v4/content/probability_entry.h
index 9c4ab18..473354b 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h
+++ b/native/jni/src/dictionary/structure/v4/content/probability_entry.h
@@ -21,10 +21,10 @@
#include <cstdint>
#include "defines.h"
-#include "suggest/core/dictionary/property/historical_info.h"
-#include "suggest/core/dictionary/property/ngram_property.h"
-#include "suggest/core/dictionary/property/unigram_property.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
+#include "dictionary/property/historical_info.h"
+#include "dictionary/property/ngram_property.h"
+#include "dictionary/property/unigram_property.h"
+#include "dictionary/structure/v4/ver4_dict_constants.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.cpp b/native/jni/src/dictionary/structure/v4/content/shortcut_dict_content.cpp
similarity index 97%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.cpp
rename to native/jni/src/dictionary/structure/v4/content/shortcut_dict_content.cpp
index 41d9c54..e3b4194 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.cpp
+++ b/native/jni/src/dictionary/structure/v4/content/shortcut_dict_content.cpp
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h"
+#include "dictionary/structure/v4/content/shortcut_dict_content.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h b/native/jni/src/dictionary/structure/v4/content/shortcut_dict_content.h
similarity index 93%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h
rename to native/jni/src/dictionary/structure/v4/content/shortcut_dict_content.h
index 85c9ce8..27de4e7 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h
+++ b/native/jni/src/dictionary/structure/v4/content/shortcut_dict_content.h
@@ -20,9 +20,9 @@
#include <cstdio>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
+#include "dictionary/structure/v4/content/sparse_table_dict_content.h"
+#include "dictionary/structure/v4/content/terminal_position_lookup_table.h"
+#include "dictionary/structure/v4/ver4_dict_constants.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h b/native/jni/src/dictionary/structure/v4/content/single_dict_content.h
similarity index 88%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h
rename to native/jni/src/dictionary/structure/v4/content/single_dict_content.h
index 309c434..6faa9a2 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h
+++ b/native/jni/src/dictionary/structure/v4/content/single_dict_content.h
@@ -20,9 +20,9 @@
#include <cstdio>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"
+#include "dictionary/structure/v4/ver4_dict_constants.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/dict_file_writing_utils.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.cpp b/native/jni/src/dictionary/structure/v4/content/sparse_table_dict_content.cpp
similarity index 88%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.cpp
rename to native/jni/src/dictionary/structure/v4/content/sparse_table_dict_content.cpp
index 896ce6b..685365f 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.cpp
+++ b/native/jni/src/dictionary/structure/v4/content/sparse_table_dict_content.cpp
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h"
+#include "dictionary/structure/v4/content/sparse_table_dict_content.h"
-#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"
+#include "dictionary/utils/dict_file_writing_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h b/native/jni/src/dictionary/structure/v4/content/sparse_table_dict_content.h
similarity index 93%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h
rename to native/jni/src/dictionary/structure/v4/content/sparse_table_dict_content.h
index 0ce2da7..6245abc 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h
+++ b/native/jni/src/dictionary/structure/v4/content/sparse_table_dict_content.h
@@ -20,9 +20,9 @@
#include <cstdio>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/sparse_table.h"
+#include "dictionary/structure/v4/ver4_dict_constants.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/sparse_table.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.cpp b/native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.cpp
similarity index 95%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.cpp
rename to native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.cpp
index 7bda3dc..5503151 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.cpp
+++ b/native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.cpp
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h"
+#include "dictionary/structure/v4/content/terminal_position_lookup_table.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h b/native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.h
similarity index 91%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h
rename to native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.h
index febcbe5..f45ceb5 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h
+++ b/native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.h
@@ -21,8 +21,8 @@
#include <unordered_map>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
+#include "dictionary/structure/v4/content/single_dict_content.h"
+#include "dictionary/structure/v4/ver4_dict_constants.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h b/native/jni/src/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h
similarity index 92%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h
rename to native/jni/src/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h
index 7902735..25ab225 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h
+++ b/native/jni/src/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h
@@ -18,10 +18,10 @@
#define LATINIME_VER4_SHORTCUT_LIST_POLICY_H
#include "defines.h"
-#include "suggest/core/policy/dictionary_shortcuts_structure_policy.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h"
+#include "dictionary/interface/dictionary_shortcuts_structure_policy.h"
+#include "dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h"
+#include "dictionary/structure/v4/content/shortcut_dict_content.h"
+#include "dictionary/structure/v4/content/terminal_position_lookup_table.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.cpp b/native/jni/src/dictionary/structure/v4/ver4_dict_buffers.cpp
similarity index 96%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.cpp
rename to native/jni/src/dictionary/structure/v4/ver4_dict_buffers.cpp
index 4d088dc..b0a8283 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.cpp
+++ b/native/jni/src/dictionary/structure/v4/ver4_dict_buffers.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h"
+#include "dictionary/structure/v4/ver4_dict_buffers.h"
#include <cerrno>
#include <cstring>
@@ -23,9 +23,9 @@
#include <sys/types.h>
#include <vector>
-#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h"
-#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"
-#include "suggest/policyimpl/dictionary/utils/file_utils.h"
+#include "dictionary/utils/byte_array_utils.h"
+#include "dictionary/utils/dict_file_writing_utils.h"
+#include "dictionary/utils/file_utils.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h b/native/jni/src/dictionary/structure/v4/ver4_dict_buffers.h
similarity index 88%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h
rename to native/jni/src/dictionary/structure/v4/ver4_dict_buffers.h
index 5407525..c8270c9 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h
+++ b/native/jni/src/dictionary/structure/v4/ver4_dict_buffers.h
@@ -21,13 +21,13 @@
#include <memory>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h"
+#include "dictionary/header/header_policy.h"
+#include "dictionary/structure/v4/content/language_model_dict_content.h"
+#include "dictionary/structure/v4/content/shortcut_dict_content.h"
+#include "dictionary/structure/v4/content/terminal_position_lookup_table.h"
+#include "dictionary/structure/v4/ver4_dict_constants.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/mmapped_buffer.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp b/native/jni/src/dictionary/structure/v4/ver4_dict_constants.cpp
similarity index 97%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp
rename to native/jni/src/dictionary/structure/v4/ver4_dict_constants.cpp
index bd89b8d..fd69078 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp
+++ b/native/jni/src/dictionary/structure/v4/ver4_dict_constants.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
+#include "dictionary/structure/v4/ver4_dict_constants.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h b/native/jni/src/dictionary/structure/v4/ver4_dict_constants.h
similarity index 100%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h
rename to native/jni/src/dictionary/structure/v4/ver4_dict_constants.h
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp
similarity index 83%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp
rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp
index 4110d60..b38b03d 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp
+++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h"
+#include "dictionary/structure/v4/ver4_patricia_trie_node_reader.h"
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h"
+#include "dictionary/header/header_policy.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
+#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h"
+#include "dictionary/structure/v4/content/language_model_dict_content.h"
+#include "dictionary/structure/v4/content/probability_entry.h"
+#include "dictionary/structure/v4/ver4_patricia_trie_reading_utils.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/forgetting_curve_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_reader.h
similarity index 91%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h
rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_reader.h
index f4df544..4e5ae3a 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h
+++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_reader.h
@@ -18,8 +18,8 @@
#define LATINIME_VER4_PATRICIA_TRIE_NODE_READER_H
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h"
+#include "dictionary/structure/pt_common/pt_node_params.h"
+#include "dictionary/structure/pt_common/pt_node_reader.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp
similarity index 94%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp
rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp
index 3488f7d..d974b50 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp
+++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp
@@ -14,19 +14,19 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h"
+#include "dictionary/structure/v4/ver4_patricia_trie_node_writer.h"
-#include "suggest/core/dictionary/property/unigram_property.h"
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h"
-#include "suggest/policyimpl/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h"
+#include "dictionary/header/header_policy.h"
+#include "dictionary/property/unigram_property.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
+#include "dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
+#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h"
+#include "dictionary/structure/v4/content/probability_entry.h"
+#include "dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h"
+#include "dictionary/structure/v4/ver4_patricia_trie_node_reader.h"
+#include "dictionary/structure/v4/ver4_dict_buffers.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/forgetting_curve_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.h
similarity index 92%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h
rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.h
index 4ecf887..5585611 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h
+++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.h
@@ -18,10 +18,10 @@
#define LATINIME_VER4_PATRICIA_TRIE_NODE_WRITER_H
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
+#include "dictionary/structure/pt_common/pt_node_params.h"
+#include "dictionary/structure/pt_common/pt_node_writer.h"
+#include "dictionary/structure/v4/content/probability_entry.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.cpp
similarity index 97%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp
rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.cpp
index a967195..1dbec55 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp
+++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.cpp
@@ -14,23 +14,23 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.h"
+#include "dictionary/structure/v4/ver4_patricia_trie_policy.h"
#include <array>
#include <vector>
#include "suggest/core/dicnode/dic_node.h"
#include "suggest/core/dicnode/dic_node_vector.h"
-#include "suggest/core/dictionary/multi_bigram_map.h"
-#include "suggest/core/dictionary/ngram_listener.h"
-#include "suggest/core/dictionary/property/ngram_property.h"
-#include "suggest/core/dictionary/property/unigram_property.h"
-#include "suggest/core/dictionary/property/word_property.h"
-#include "suggest/core/session/ngram_context.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h"
-#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h"
-#include "suggest/policyimpl/dictionary/utils/probability_utils.h"
+#include "dictionary/interface/ngram_listener.h"
+#include "dictionary/property/ngram_context.h"
+#include "dictionary/property/ngram_property.h"
+#include "dictionary/property/unigram_property.h"
+#include "dictionary/property/word_property.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
+#include "dictionary/structure/v4/ver4_patricia_trie_node_reader.h"
+#include "dictionary/utils/forgetting_curve_utils.h"
+#include "dictionary/utils/multi_bigram_map.h"
+#include "dictionary/utils/probability_utils.h"
#include "utils/ngram_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.h b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.h
similarity index 85%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.h
rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.h
index 93faa83..d130a4e 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.h
+++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.h
@@ -20,17 +20,17 @@
#include <vector>
#include "defines.h"
-#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h"
-#include "suggest/policyimpl/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/entry_counters.h"
+#include "dictionary/header/header_policy.h"
+#include "dictionary/interface/dictionary_structure_with_buffer_policy.h"
+#include "dictionary/structure/pt_common/dynamic_pt_updating_helper.h"
+#include "dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h"
+#include "dictionary/structure/v4/ver4_dict_buffers.h"
+#include "dictionary/structure/v4/ver4_patricia_trie_node_reader.h"
+#include "dictionary/structure/v4/ver4_patricia_trie_node_writer.h"
+#include "dictionary/structure/v4/ver4_patricia_trie_writing_helper.h"
+#include "dictionary/structure/v4/ver4_pt_node_array_reader.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/entry_counters.h"
#include "utils/int_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp
similarity index 84%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp
rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp
index 254022d..ccb70cd 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp
+++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h"
+#include "dictionary/structure/v4/ver4_patricia_trie_reading_utils.h"
-#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h"
+#include "dictionary/utils/byte_array_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h
similarity index 100%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h
rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp
similarity index 90%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp
rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp
index 34af76c..6dfdf4d 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp
+++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp
@@ -14,21 +14,21 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h"
+#include "dictionary/structure/v4/ver4_patricia_trie_writing_helper.h"
#include <cstring>
#include <queue>
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
-#include "suggest/policyimpl/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/file_utils.h"
-#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h"
+#include "dictionary/header/header_policy.h"
+#include "dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h"
+#include "dictionary/structure/v4/ver4_dict_buffers.h"
+#include "dictionary/structure/v4/ver4_dict_constants.h"
+#include "dictionary/structure/v4/ver4_patricia_trie_node_reader.h"
+#include "dictionary/structure/v4/ver4_patricia_trie_node_writer.h"
+#include "dictionary/structure/v4/ver4_pt_node_array_reader.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/file_utils.h"
+#include "dictionary/utils/forgetting_curve_utils.h"
#include "utils/ngram_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h
similarity index 91%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h
rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h
index c56cea5..68dd1ca 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h
+++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h
@@ -18,9 +18,9 @@
#define LATINIME_VER4_PATRICIA_TRIE_WRITING_HELPER_H
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h"
-#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h"
-#include "suggest/policyimpl/dictionary/utils/entry_counters.h"
+#include "dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h"
+#include "dictionary/structure/v4/content/terminal_position_lookup_table.h"
+#include "dictionary/utils/entry_counters.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.cpp b/native/jni/src/dictionary/structure/v4/ver4_pt_node_array_reader.cpp
similarity index 89%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.cpp
rename to native/jni/src/dictionary/structure/v4/ver4_pt_node_array_reader.cpp
index b014c52..63d0b4a 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.cpp
+++ b/native/jni/src/dictionary/structure/v4/ver4_pt_node_array_reader.cpp
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h"
+#include "dictionary/structure/v4/ver4_pt_node_array_reader.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h"
+#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h b/native/jni/src/dictionary/structure/v4/ver4_pt_node_array_reader.h
similarity index 94%
rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h
rename to native/jni/src/dictionary/structure/v4/ver4_pt_node_array_reader.h
index d81808e..ccb760b 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h
+++ b/native/jni/src/dictionary/structure/v4/ver4_pt_node_array_reader.h
@@ -18,7 +18,7 @@
#define LATINIME_VER4_PT_NODE_ARRAY_READER_H
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h"
+#include "dictionary/structure/pt_common/pt_node_array_reader.h"
namespace latinime {
diff --git a/native/jni/src/suggest/core/dictionary/binary_dictionary_bigrams_iterator.h b/native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h
similarity index 96%
rename from native/jni/src/suggest/core/dictionary/binary_dictionary_bigrams_iterator.h
rename to native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h
index 178b065..8a61473 100644
--- a/native/jni/src/suggest/core/dictionary/binary_dictionary_bigrams_iterator.h
+++ b/native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h
@@ -18,7 +18,7 @@
#define LATINIME_BINARY_DICTIONARY_BIGRAMS_ITERATOR_H
#include "defines.h"
-#include "suggest/core/policy/dictionary_bigrams_structure_policy.h"
+#include "dictionary/interface/dictionary_bigrams_structure_policy.h"
namespace latinime {
diff --git a/native/jni/src/suggest/core/dictionary/binary_dictionary_shortcut_iterator.h b/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h
similarity index 96%
rename from native/jni/src/suggest/core/dictionary/binary_dictionary_shortcut_iterator.h
rename to native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h
index ee1606b..a4ddd58 100644
--- a/native/jni/src/suggest/core/dictionary/binary_dictionary_shortcut_iterator.h
+++ b/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h
@@ -18,7 +18,7 @@
#define LATINIME_BINARY_DICTIONARY_SHORTCUT_ITERATOR_H
#include "defines.h"
-#include "suggest/core/policy/dictionary_shortcuts_structure_policy.h"
+#include "dictionary/interface/dictionary_shortcuts_structure_policy.h"
namespace latinime {
diff --git a/native/jni/src/suggest/core/dictionary/bloom_filter.h b/native/jni/src/dictionary/utils/bloom_filter.h
similarity index 100%
rename from native/jni/src/suggest/core/dictionary/bloom_filter.h
rename to native/jni/src/dictionary/utils/bloom_filter.h
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp b/native/jni/src/dictionary/utils/buffer_with_extendable_buffer.cpp
similarity index 98%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp
rename to native/jni/src/dictionary/utils/buffer_with_extendable_buffer.cpp
index da2c30c..2175696 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp
+++ b/native/jni/src/dictionary/utils/buffer_with_extendable_buffer.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h b/native/jni/src/dictionary/utils/buffer_with_extendable_buffer.h
similarity index 98%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h
rename to native/jni/src/dictionary/utils/buffer_with_extendable_buffer.h
index fad83aa..0a141d4 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h
+++ b/native/jni/src/dictionary/utils/buffer_with_extendable_buffer.h
@@ -22,7 +22,7 @@
#include <vector>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h"
+#include "dictionary/utils/byte_array_utils.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.cpp b/native/jni/src/dictionary/utils/byte_array_utils.cpp
similarity index 92%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.cpp
rename to native/jni/src/dictionary/utils/byte_array_utils.cpp
index 1833e88..d38f082 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.cpp
+++ b/native/jni/src/dictionary/utils/byte_array_utils.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h"
+#include "dictionary/utils/byte_array_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h b/native/jni/src/dictionary/utils/byte_array_utils.h
similarity index 100%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h
rename to native/jni/src/dictionary/utils/byte_array_utils.h
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/dict_file_writing_utils.cpp b/native/jni/src/dictionary/utils/dict_file_writing_utils.cpp
similarity index 89%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/dict_file_writing_utils.cpp
rename to native/jni/src/dictionary/utils/dict_file_writing_utils.cpp
index edcb436..033a758 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/dict_file_writing_utils.cpp
+++ b/native/jni/src/dictionary/utils/dict_file_writing_utils.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"
+#include "dictionary/utils/dict_file_writing_utils.h"
#include <cstdio>
#include <errno.h>
@@ -22,14 +22,14 @@
#include <sys/stat.h>
#include <sys/types.h>
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
-#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h"
-#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
-#include "suggest/policyimpl/dictionary/utils/entry_counters.h"
-#include "suggest/policyimpl/dictionary/utils/file_utils.h"
-#include "suggest/policyimpl/dictionary/utils/format_utils.h"
+#include "dictionary/header/header_policy.h"
+#include "dictionary/structure/backward/v402/ver4_dict_buffers.h"
+#include "dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
+#include "dictionary/structure/v4/ver4_dict_buffers.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/entry_counters.h"
+#include "dictionary/utils/file_utils.h"
+#include "dictionary/utils/format_utils.h"
#include "utils/time_keeper.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h b/native/jni/src/dictionary/utils/dict_file_writing_utils.h
similarity index 94%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h
rename to native/jni/src/dictionary/utils/dict_file_writing_utils.h
index 4843b3b..102a89d 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h
+++ b/native/jni/src/dictionary/utils/dict_file_writing_utils.h
@@ -20,8 +20,8 @@
#include <cstdio>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/header/header_read_write_utils.h"
-#include "suggest/policyimpl/dictionary/utils/format_utils.h"
+#include "dictionary/header/header_read_write_utils.h"
+#include "dictionary/utils/format_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/entry_counters.h b/native/jni/src/dictionary/utils/entry_counters.h
similarity index 100%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/entry_counters.h
rename to native/jni/src/dictionary/utils/entry_counters.h
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/file_utils.cpp b/native/jni/src/dictionary/utils/file_utils.cpp
similarity index 98%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/file_utils.cpp
rename to native/jni/src/dictionary/utils/file_utils.cpp
index fb80f38..bb392fb 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/file_utils.cpp
+++ b/native/jni/src/dictionary/utils/file_utils.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/file_utils.h"
+#include "dictionary/utils/file_utils.h"
#include <cstdio>
#include <cstring>
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/file_utils.h b/native/jni/src/dictionary/utils/file_utils.h
similarity index 100%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/file_utils.h
rename to native/jni/src/dictionary/utils/file_utils.h
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.cpp b/native/jni/src/dictionary/utils/forgetting_curve_utils.cpp
similarity index 97%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.cpp
rename to native/jni/src/dictionary/utils/forgetting_curve_utils.cpp
index f05c614..d79ed91 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.cpp
+++ b/native/jni/src/dictionary/utils/forgetting_curve_utils.cpp
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h"
+#include "dictionary/utils/forgetting_curve_utils.h"
#include <algorithm>
#include <cmath>
#include <stdlib.h>
-#include "suggest/policyimpl/dictionary/header/header_policy.h"
-#include "suggest/policyimpl/dictionary/utils/probability_utils.h"
+#include "dictionary/header/header_policy.h"
+#include "dictionary/utils/probability_utils.h"
#include "utils/time_keeper.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h b/native/jni/src/dictionary/utils/forgetting_curve_utils.h
similarity index 96%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h
rename to native/jni/src/dictionary/utils/forgetting_curve_utils.h
index 06dcae8..ddaac7e 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h
+++ b/native/jni/src/dictionary/utils/forgetting_curve_utils.h
@@ -20,8 +20,8 @@
#include <vector>
#include "defines.h"
-#include "suggest/core/dictionary/property/historical_info.h"
-#include "suggest/policyimpl/dictionary/utils/entry_counters.h"
+#include "dictionary/property/historical_info.h"
+#include "dictionary/utils/entry_counters.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.cpp b/native/jni/src/dictionary/utils/format_utils.cpp
similarity index 95%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.cpp
rename to native/jni/src/dictionary/utils/format_utils.cpp
index e225c23..cef3b09 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.cpp
+++ b/native/jni/src/dictionary/utils/format_utils.cpp
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/format_utils.h"
+#include "dictionary/utils/format_utils.h"
-#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h"
+#include "dictionary/utils/byte_array_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.h b/native/jni/src/dictionary/utils/format_utils.h
similarity index 100%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.h
rename to native/jni/src/dictionary/utils/format_utils.h
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.cpp b/native/jni/src/dictionary/utils/mmapped_buffer.cpp
similarity index 96%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.cpp
rename to native/jni/src/dictionary/utils/mmapped_buffer.cpp
index 4a126ff..c5259de 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.cpp
+++ b/native/jni/src/dictionary/utils/mmapped_buffer.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h"
+#include "dictionary/utils/mmapped_buffer.h"
#include <cerrno>
#include <climits>
@@ -23,7 +23,7 @@
#include <sys/mman.h>
#include <unistd.h>
-#include "suggest/policyimpl/dictionary/utils/file_utils.h"
+#include "dictionary/utils/file_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.h b/native/jni/src/dictionary/utils/mmapped_buffer.h
similarity index 100%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.h
rename to native/jni/src/dictionary/utils/mmapped_buffer.h
diff --git a/native/jni/src/suggest/core/dictionary/multi_bigram_map.cpp b/native/jni/src/dictionary/utils/multi_bigram_map.cpp
similarity index 98%
rename from native/jni/src/suggest/core/dictionary/multi_bigram_map.cpp
rename to native/jni/src/dictionary/utils/multi_bigram_map.cpp
index 761f51e..e730fff 100644
--- a/native/jni/src/suggest/core/dictionary/multi_bigram_map.cpp
+++ b/native/jni/src/dictionary/utils/multi_bigram_map.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/core/dictionary/multi_bigram_map.h"
+#include "dictionary/utils/multi_bigram_map.h"
#include <cstddef>
#include <unordered_map>
diff --git a/native/jni/src/suggest/core/dictionary/multi_bigram_map.h b/native/jni/src/dictionary/utils/multi_bigram_map.h
similarity index 92%
rename from native/jni/src/suggest/core/dictionary/multi_bigram_map.h
rename to native/jni/src/dictionary/utils/multi_bigram_map.h
index d2eb5cc..6f23d98 100644
--- a/native/jni/src/suggest/core/dictionary/multi_bigram_map.h
+++ b/native/jni/src/dictionary/utils/multi_bigram_map.h
@@ -21,10 +21,10 @@
#include <unordered_map>
#include "defines.h"
-#include "suggest/core/dictionary/binary_dictionary_bigrams_iterator.h"
-#include "suggest/core/dictionary/bloom_filter.h"
-#include "suggest/core/dictionary/ngram_listener.h"
-#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
+#include "dictionary/interface/dictionary_structure_with_buffer_policy.h"
+#include "dictionary/interface/ngram_listener.h"
+#include "dictionary/utils/binary_dictionary_bigrams_iterator.h"
+#include "dictionary/utils/bloom_filter.h"
#include "utils/int_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/probability_utils.cpp b/native/jni/src/dictionary/utils/probability_utils.cpp
similarity index 91%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/probability_utils.cpp
rename to native/jni/src/dictionary/utils/probability_utils.cpp
index e8fa069..426a0e7 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/probability_utils.cpp
+++ b/native/jni/src/dictionary/utils/probability_utils.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/probability_utils.h"
+#include "dictionary/utils/probability_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/probability_utils.h b/native/jni/src/dictionary/utils/probability_utils.h
similarity index 100%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/probability_utils.h
rename to native/jni/src/dictionary/utils/probability_utils.h
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.cpp b/native/jni/src/dictionary/utils/sparse_table.cpp
similarity index 98%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.cpp
rename to native/jni/src/dictionary/utils/sparse_table.cpp
index d336306..029329f 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.cpp
+++ b/native/jni/src/dictionary/utils/sparse_table.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/sparse_table.h"
+#include "dictionary/utils/sparse_table.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.h b/native/jni/src/dictionary/utils/sparse_table.h
similarity index 95%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.h
rename to native/jni/src/dictionary/utils/sparse_table.h
index e1a96c6..bd1190e 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.h
+++ b/native/jni/src/dictionary/utils/sparse_table.h
@@ -20,7 +20,7 @@
#include <cstdint>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp b/native/jni/src/dictionary/utils/trie_map.cpp
similarity index 98%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp
rename to native/jni/src/dictionary/utils/trie_map.cpp
index b7ef2b9..0bef8c7 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp
+++ b/native/jni/src/dictionary/utils/trie_map.cpp
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/trie_map.h"
+#include "dictionary/utils/trie_map.h"
-#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"
+#include "dictionary/utils/dict_file_writing_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.h b/native/jni/src/dictionary/utils/trie_map.h
similarity index 99%
rename from native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.h
rename to native/jni/src/dictionary/utils/trie_map.h
index 0076588..5fc6c26 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.h
+++ b/native/jni/src/dictionary/utils/trie_map.h
@@ -23,7 +23,7 @@
#include <vector>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
#include "utils/byte_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp b/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp
index ea43892..a20252c 100644
--- a/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp
+++ b/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp
@@ -16,9 +16,9 @@
#include "suggest/core/dicnode/dic_node_utils.h"
+#include "dictionary/interface/dictionary_structure_with_buffer_policy.h"
#include "suggest/core/dicnode/dic_node.h"
#include "suggest/core/dicnode/dic_node_vector.h"
-#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
namespace latinime {
diff --git a/native/jni/src/suggest/core/dictionary/dictionary.cpp b/native/jni/src/suggest/core/dictionary/dictionary.cpp
index 6a5df9d..5c9a139 100644
--- a/native/jni/src/suggest/core/dictionary/dictionary.cpp
+++ b/native/jni/src/suggest/core/dictionary/dictionary.cpp
@@ -19,11 +19,11 @@
#include "suggest/core/dictionary/dictionary.h"
#include "defines.h"
+#include "dictionary/interface/dictionary_header_structure_policy.h"
+#include "dictionary/property/ngram_context.h"
#include "suggest/core/dictionary/dictionary_utils.h"
-#include "suggest/core/policy/dictionary_header_structure_policy.h"
#include "suggest/core/result/suggestion_results.h"
#include "suggest/core/session/dic_traverse_session.h"
-#include "suggest/core/session/ngram_context.h"
#include "suggest/core/suggest.h"
#include "suggest/core/suggest_options.h"
#include "suggest/policyimpl/gesture/gesture_suggest_policy_factory.h"
diff --git a/native/jni/src/suggest/core/dictionary/dictionary.h b/native/jni/src/suggest/core/dictionary/dictionary.h
index b177437..9e224eb 100644
--- a/native/jni/src/suggest/core/dictionary/dictionary.h
+++ b/native/jni/src/suggest/core/dictionary/dictionary.h
@@ -21,11 +21,11 @@
#include "defines.h"
#include "jni.h"
-#include "suggest/core/dictionary/ngram_listener.h"
-#include "suggest/core/dictionary/property/historical_info.h"
-#include "suggest/core/dictionary/property/word_property.h"
-#include "suggest/core/policy/dictionary_header_structure_policy.h"
-#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
+#include "dictionary/interface/dictionary_header_structure_policy.h"
+#include "dictionary/interface/dictionary_structure_with_buffer_policy.h"
+#include "dictionary/interface/ngram_listener.h"
+#include "dictionary/property/historical_info.h"
+#include "dictionary/property/word_property.h"
#include "suggest/core/suggest_interface.h"
#include "utils/int_array_view.h"
diff --git a/native/jni/src/suggest/core/dictionary/dictionary_utils.cpp b/native/jni/src/suggest/core/dictionary/dictionary_utils.cpp
index 9573c37..7de5500 100644
--- a/native/jni/src/suggest/core/dictionary/dictionary_utils.cpp
+++ b/native/jni/src/suggest/core/dictionary/dictionary_utils.cpp
@@ -16,13 +16,13 @@
#include "suggest/core/dictionary/dictionary_utils.h"
+#include "dictionary/interface/dictionary_structure_with_buffer_policy.h"
+#include "dictionary/property/ngram_context.h"
#include "suggest/core/dicnode/dic_node.h"
#include "suggest/core/dicnode/dic_node_priority_queue.h"
#include "suggest/core/dicnode/dic_node_vector.h"
#include "suggest/core/dictionary/dictionary.h"
#include "suggest/core/dictionary/digraph_utils.h"
-#include "suggest/core/session/ngram_context.h"
-#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
#include "utils/int_array_view.h"
namespace latinime {
diff --git a/native/jni/src/suggest/core/dictionary/digraph_utils.cpp b/native/jni/src/suggest/core/dictionary/digraph_utils.cpp
index bb2ce50..4d68f62 100644
--- a/native/jni/src/suggest/core/dictionary/digraph_utils.cpp
+++ b/native/jni/src/suggest/core/dictionary/digraph_utils.cpp
@@ -19,7 +19,7 @@
#include <cstdlib>
#include "defines.h"
-#include "suggest/core/policy/dictionary_header_structure_policy.h"
+#include "dictionary/interface/dictionary_header_structure_policy.h"
#include "utils/char_utils.h"
namespace latinime {
diff --git a/native/jni/src/suggest/core/result/suggestions_output_utils.cpp b/native/jni/src/suggest/core/result/suggestions_output_utils.cpp
index 1aff729..7c37241 100644
--- a/native/jni/src/suggest/core/result/suggestions_output_utils.cpp
+++ b/native/jni/src/suggest/core/result/suggestions_output_utils.cpp
@@ -19,9 +19,9 @@
#include <algorithm>
#include <vector>
+#include "dictionary/utils/binary_dictionary_shortcut_iterator.h"
#include "suggest/core/dicnode/dic_node.h"
#include "suggest/core/dicnode/dic_node_utils.h"
-#include "suggest/core/dictionary/binary_dictionary_shortcut_iterator.h"
#include "suggest/core/dictionary/error_type_utils.h"
#include "suggest/core/policy/scoring.h"
#include "suggest/core/result/suggestion_results.h"
diff --git a/native/jni/src/suggest/core/result/suggestions_output_utils.h b/native/jni/src/suggest/core/result/suggestions_output_utils.h
index eca1f78..bcb75a4 100644
--- a/native/jni/src/suggest/core/result/suggestions_output_utils.h
+++ b/native/jni/src/suggest/core/result/suggestions_output_utils.h
@@ -18,7 +18,7 @@
#define LATINIME_SUGGESTIONS_OUTPUT_UTILS
#include "defines.h"
-#include "suggest/core/dictionary/word_attributes.h"
+#include "dictionary/property/word_attributes.h"
namespace latinime {
diff --git a/native/jni/src/suggest/core/session/dic_traverse_session.cpp b/native/jni/src/suggest/core/session/dic_traverse_session.cpp
index 52dc2f8..d7dd5a0 100644
--- a/native/jni/src/suggest/core/session/dic_traverse_session.cpp
+++ b/native/jni/src/suggest/core/session/dic_traverse_session.cpp
@@ -17,10 +17,10 @@
#include "suggest/core/session/dic_traverse_session.h"
#include "defines.h"
+#include "dictionary/interface/dictionary_header_structure_policy.h"
+#include "dictionary/interface/dictionary_structure_with_buffer_policy.h"
+#include "dictionary/property/ngram_context.h"
#include "suggest/core/dictionary/dictionary.h"
-#include "suggest/core/policy/dictionary_header_structure_policy.h"
-#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
-#include "suggest/core/session/ngram_context.h"
namespace latinime {
diff --git a/native/jni/src/suggest/core/session/dic_traverse_session.h b/native/jni/src/suggest/core/session/dic_traverse_session.h
index bc53167..f5fcfdd 100644
--- a/native/jni/src/suggest/core/session/dic_traverse_session.h
+++ b/native/jni/src/suggest/core/session/dic_traverse_session.h
@@ -20,9 +20,9 @@
#include <vector>
#include "defines.h"
+#include "dictionary/utils/multi_bigram_map.h"
#include "jni.h"
#include "suggest/core/dicnode/dic_nodes_cache.h"
-#include "suggest/core/dictionary/multi_bigram_map.h"
#include "suggest/core/layout/proximity_info_state.h"
#include "utils/int_array_view.h"
diff --git a/native/jni/src/suggest/core/suggest.cpp b/native/jni/src/suggest/core/suggest.cpp
index e5e9b46..52fa5a5 100644
--- a/native/jni/src/suggest/core/suggest.cpp
+++ b/native/jni/src/suggest/core/suggest.cpp
@@ -16,14 +16,14 @@
#include "suggest/core/suggest.h"
+#include "dictionary/interface/dictionary_structure_with_buffer_policy.h"
+#include "dictionary/property/word_attributes.h"
#include "suggest/core/dicnode/dic_node.h"
#include "suggest/core/dicnode/dic_node_priority_queue.h"
#include "suggest/core/dicnode/dic_node_vector.h"
#include "suggest/core/dictionary/dictionary.h"
#include "suggest/core/dictionary/digraph_utils.h"
-#include "suggest/core/dictionary/word_attributes.h"
#include "suggest/core/layout/proximity_info.h"
-#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
#include "suggest/core/policy/traversal.h"
#include "suggest/core/policy/weighting.h"
#include "suggest/core/result/suggestions_output_utils.h"
diff --git a/native/jni/src/utils/jni_data_utils.h b/native/jni/src/utils/jni_data_utils.h
index 0129585..8024e34 100644
--- a/native/jni/src/utils/jni_data_utils.h
+++ b/native/jni/src/utils/jni_data_utils.h
@@ -20,11 +20,11 @@
#include <vector>
#include "defines.h"
+#include "dictionary/header/header_read_write_utils.h"
+#include "dictionary/interface/dictionary_header_structure_policy.h"
+#include "dictionary/property/ngram_context.h"
+#include "dictionary/property/word_property.h"
#include "jni.h"
-#include "suggest/core/dictionary/property/word_property.h"
-#include "suggest/core/session/ngram_context.h"
-#include "suggest/core/policy/dictionary_header_structure_policy.h"
-#include "suggest/policyimpl/dictionary/header/header_read_write_utils.h"
#include "utils/char_utils.h"
namespace latinime {
diff --git a/native/jni/tests/suggest/policyimpl/dictionary/header/header_read_write_utils_test.cpp b/native/jni/tests/dictionary/header/header_read_write_utils_test.cpp
similarity index 95%
rename from native/jni/tests/suggest/policyimpl/dictionary/header/header_read_write_utils_test.cpp
rename to native/jni/tests/dictionary/header/header_read_write_utils_test.cpp
index da6a2af..eab5d65 100644
--- a/native/jni/tests/suggest/policyimpl/dictionary/header/header_read_write_utils_test.cpp
+++ b/native/jni/tests/dictionary/header/header_read_write_utils_test.cpp
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/header/header_read_write_utils.h"
+#include "dictionary/header/header_read_write_utils.h"
#include <gtest/gtest.h>
#include <cstring>
#include <vector>
-#include "suggest/core/policy/dictionary_header_structure_policy.h"
+#include "dictionary/interface/dictionary_header_structure_policy.h"
namespace latinime {
namespace {
diff --git a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp b/native/jni/tests/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp
similarity index 91%
rename from native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp
rename to native/jni/tests/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp
index 44b5a8a..2e3047e 100644
--- a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp
+++ b/native/jni/tests/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.h"
+#include "dictionary/structure/v4/content/language_model_dict_content_global_counters.h"
#include <gtest/gtest.h>
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
+#include "dictionary/structure/v4/ver4_dict_constants.h"
namespace latinime {
namespace {
diff --git a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_test.cpp b/native/jni/tests/dictionary/structure/v4/content/language_model_dict_content_test.cpp
similarity index 98%
rename from native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_test.cpp
rename to native/jni/tests/dictionary/structure/v4/content/language_model_dict_content_test.cpp
index 313a9af..ca8626e 100644
--- a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_test.cpp
+++ b/native/jni/tests/dictionary/structure/v4/content/language_model_dict_content_test.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h"
+#include "dictionary/structure/v4/content/language_model_dict_content.h"
#include <gtest/gtest.h>
diff --git a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/probability_entry_test.cpp b/native/jni/tests/dictionary/structure/v4/content/probability_entry_test.cpp
similarity index 95%
rename from native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/probability_entry_test.cpp
rename to native/jni/tests/dictionary/structure/v4/content/probability_entry_test.cpp
index eb78034..ba81671 100644
--- a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/probability_entry_test.cpp
+++ b/native/jni/tests/dictionary/structure/v4/content/probability_entry_test.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h"
+#include "dictionary/structure/v4/content/probability_entry.h"
#include <gtest/gtest.h>
diff --git a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp b/native/jni/tests/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp
similarity index 94%
rename from native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp
rename to native/jni/tests/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp
index 23b9c55..4f23889 100644
--- a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp
+++ b/native/jni/tests/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h"
+#include "dictionary/structure/v4/content/terminal_position_lookup_table.h"
#include <gtest/gtest.h>
#include <vector>
#include "defines.h"
-#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
+#include "dictionary/structure/v4/ver4_dict_constants.h"
namespace latinime {
namespace {
diff --git a/native/jni/tests/suggest/core/dictionary/bloom_filter_test.cpp b/native/jni/tests/dictionary/utils/bloom_filter_test.cpp
similarity index 97%
rename from native/jni/tests/suggest/core/dictionary/bloom_filter_test.cpp
rename to native/jni/tests/dictionary/utils/bloom_filter_test.cpp
index b620217..bcc8843 100644
--- a/native/jni/tests/suggest/core/dictionary/bloom_filter_test.cpp
+++ b/native/jni/tests/dictionary/utils/bloom_filter_test.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/core/dictionary/bloom_filter.h"
+#include "dictionary/utils/bloom_filter.h"
#include <gtest/gtest.h>
diff --git a/native/jni/tests/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer_test.cpp b/native/jni/tests/dictionary/utils/buffer_with_extendable_buffer_test.cpp
similarity index 97%
rename from native/jni/tests/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer_test.cpp
rename to native/jni/tests/dictionary/utils/buffer_with_extendable_buffer_test.cpp
index fa6c6d7..2587891 100644
--- a/native/jni/tests/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer_test.cpp
+++ b/native/jni/tests/dictionary/utils/buffer_with_extendable_buffer_test.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
#include <gtest/gtest.h>
diff --git a/native/jni/tests/suggest/policyimpl/dictionary/utils/byte_array_utils_test.cpp b/native/jni/tests/dictionary/utils/byte_array_utils_test.cpp
similarity index 98%
rename from native/jni/tests/suggest/policyimpl/dictionary/utils/byte_array_utils_test.cpp
rename to native/jni/tests/dictionary/utils/byte_array_utils_test.cpp
index c201e0d..0725753 100644
--- a/native/jni/tests/suggest/policyimpl/dictionary/utils/byte_array_utils_test.cpp
+++ b/native/jni/tests/dictionary/utils/byte_array_utils_test.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h"
+#include "dictionary/utils/byte_array_utils.h"
#include <gtest/gtest.h>
diff --git a/native/jni/tests/suggest/policyimpl/dictionary/utils/format_utils_test.cpp b/native/jni/tests/dictionary/utils/format_utils_test.cpp
similarity index 97%
rename from native/jni/tests/suggest/policyimpl/dictionary/utils/format_utils_test.cpp
rename to native/jni/tests/dictionary/utils/format_utils_test.cpp
index 4942005..3561bda 100644
--- a/native/jni/tests/suggest/policyimpl/dictionary/utils/format_utils_test.cpp
+++ b/native/jni/tests/dictionary/utils/format_utils_test.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/format_utils.h"
+#include "dictionary/utils/format_utils.h"
#include <gtest/gtest.h>
diff --git a/native/jni/tests/suggest/policyimpl/dictionary/utils/probability_utils_test.cpp b/native/jni/tests/dictionary/utils/probability_utils_test.cpp
similarity index 93%
rename from native/jni/tests/suggest/policyimpl/dictionary/utils/probability_utils_test.cpp
rename to native/jni/tests/dictionary/utils/probability_utils_test.cpp
index be1f278..4020ea4 100644
--- a/native/jni/tests/suggest/policyimpl/dictionary/utils/probability_utils_test.cpp
+++ b/native/jni/tests/dictionary/utils/probability_utils_test.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/probability_utils.h"
+#include "dictionary/utils/probability_utils.h"
#include <gtest/gtest.h>
diff --git a/native/jni/tests/suggest/policyimpl/dictionary/utils/sparse_table_test.cpp b/native/jni/tests/dictionary/utils/sparse_table_test.cpp
similarity index 91%
rename from native/jni/tests/suggest/policyimpl/dictionary/utils/sparse_table_test.cpp
rename to native/jni/tests/dictionary/utils/sparse_table_test.cpp
index 0b57156..237c963 100644
--- a/native/jni/tests/suggest/policyimpl/dictionary/utils/sparse_table_test.cpp
+++ b/native/jni/tests/dictionary/utils/sparse_table_test.cpp
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/sparse_table.h"
+#include "dictionary/utils/sparse_table.h"
#include <gtest/gtest.h>
-#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
+#include "dictionary/utils/buffer_with_extendable_buffer.h"
namespace latinime {
namespace {
diff --git a/native/jni/tests/suggest/policyimpl/dictionary/utils/trie_map_test.cpp b/native/jni/tests/dictionary/utils/trie_map_test.cpp
similarity index 99%
rename from native/jni/tests/suggest/policyimpl/dictionary/utils/trie_map_test.cpp
rename to native/jni/tests/dictionary/utils/trie_map_test.cpp
index 56b5aa9..745d398 100644
--- a/native/jni/tests/suggest/policyimpl/dictionary/utils/trie_map_test.cpp
+++ b/native/jni/tests/dictionary/utils/trie_map_test.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "suggest/policyimpl/dictionary/utils/trie_map.h"
+#include "dictionary/utils/trie_map.h"
#include <gtest/gtest.h>
diff --git a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java b/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
index 111d5c5..b5232a3 100644
--- a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
+++ b/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
@@ -418,17 +418,9 @@
SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI));
// These are preliminary subtypes and may not exist.
if (HI_LATN != null) {
- // TODO: Uncommented because of the current translation of these strings
- // in Hindi are described in Latin script.
- // assertEquals("hi_ZZ", "हिंग्लिश",
- // SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI_LATN));
- // assertEquals("hi_ZZ", "हिंग्लिश (Dvorak)",
- // SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI_LATN_DVORAK));
- // TODO: Remove these tests once the translation of these strings in Hindi
- // are described in Devanagari script.
- assertEquals("hi_ZZ", "Hinglish",
+ assertEquals("hi_ZZ", "हिंग्लिश",
SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI_LATN));
- assertEquals("hi_ZZ", "Hinglish (Dvorak)",
+ assertEquals("hi_ZZ", "हिंग्लिश (Dvorak)",
SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI_LATN_DVORAK));
}
return null;