From d060ed99464e14e19dc07bc2f770e2b83cfd16bc Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Tue, 29 Mar 2011 10:58:43 -0700 Subject: [PATCH 1/3] Import revised translations. DO NOT MERGE Change-Id: I19cdfdaf6a4139dcc4100650dd23ca12e26ede2b --- java/res/values-pl/strings.xml | 6 +++--- java/res/values-ru/strings.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml index cd2cb69f0..8fbb74e37 100644 --- a/java/res/values-pl/strings.xml +++ b/java/res/values-pl/strings.xml @@ -47,7 +47,7 @@ "Pokaż sugestie" "Wyświetl sugerowane słowa podczas wpisywania" "Autouzupełnianie" - "Spacja i znaki przestankowe wstawiają wyróżnione słowo" + "Spacja i znaki przestankowe wstawiają podświetlone słowo" "Pokaż klawisz ustawień" "Automatycznie" "Zawsze pokazuj" @@ -125,13 +125,13 @@ ".org" ".gov" ".edu" - "Wybierz metodę wprowadzania" + "Wybierz sposób wprowadzania tekstu" "Języki wprowadzania" "Przesuń palcem po spacji, aby zmienić język" "← Dotknij ponownie, aby zapisać" "Słownik dostępny" "Włącz przesyłanie opinii użytkownika" - "Pomóż ulepszyć edytor tej metody wprowadzania, automatycznie wysyłając do Google statystyki użycia i raporty o awariach." + "Pomóż ulepszyć edytor wprowadzania tekstu, automatycznie wysyłając do Google statystyki użycia i raporty o awariach." "Popraw dotknięte słowo" "Dotknięte słowo zostanie poprawione" "Motyw klawiatury" diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml index 366f3f420..0b70f0b34 100644 --- a/java/res/values-ru/strings.xml +++ b/java/res/values-ru/strings.xml @@ -38,7 +38,7 @@ "Автоматическое завершение" "Увеличить размер текстового поля" "Скрывать предложение слов в горизонтальной ориентации" - "Автоподст. заглавных" + "Заглавные автоматически" "Делать заглавной первую букву предложения" "Автопунктуация" From 8f9b86fec52652405d81ee2c64bf6a378ec119dc Mon Sep 17 00:00:00 2001 From: satok Date: Fri, 1 Apr 2011 19:31:30 +0900 Subject: [PATCH 2/3] Add settings for theme, userfeedback and other settings (temporary) Change-Id: I063c48dbf021f5608c241a3543aa2628b5faaa40 --- java/res/xml/prefs.xml | 153 +++++++++--------- .../android/inputmethod/latin/Settings.java | 10 ++ 2 files changed, 83 insertions(+), 80 deletions(-) diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index d031415d7..afe7be914 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -14,86 +14,66 @@ limitations under the License. --> - - + - + android:title="@string/general_category" + android:key="general_settings"> - + android:key="auto_cap" + android:title="@string/auto_cap" + android:persistent="true" + android:defaultValue="true" /> - + android:key="vibrate_on" + android:title="@string/vibrate_on_keypress" + android:persistent="true" /> - + android:key="sound_on" + android:title="@string/sound_on_keypress" + android:defaultValue="@bool/config_default_sound_enabled" + android:persistent="true" /> - + android:key="popup_on" + android:title="@string/popup_on_keypress" + android:persistent="true" + android:defaultValue="@bool/config_default_popup_preview" /> - + android:key="recorrection_enabled" + android:title="@string/prefs_enable_recorrection" + android:summary="@string/prefs_enable_recorrection_summary" + android:persistent="true" + android:defaultValue="@bool/config_default_recorrection_enabled" /> - + android:key="settings_key" + android:title="@string/prefs_settings_key" + android:persistent="true" + android:entryValues="@array/settings_key_modes_values" + android:entries="@array/settings_key_modes" + android:defaultValue="@string/settings_key_mode_auto" /> - + android:key="voice_mode" + android:title="@string/voice_input" + android:persistent="true" + android:entryValues="@array/voice_input_modes_values" + android:entries="@array/voice_input_modes" + android:defaultValue="@string/voice_mode_main" /> - + android:key="subtype_settings" + android:title="@string/language_selection_title" + android:summary="@string/language_selection_summary" /> - - + android:title="@string/prediction_category" + android:key="prediction_settings"> - + android:defaultValue="true" /> - + android:defaultValue="@string/auto_correction_threshold_mode_index_modest" /> - + android:defaultValue="@string/prefs_suggestion_visibility_default_value" /> + android:defaultValue="true" /> - - - + android:key="usability_study_mode" + android:title="@string/prefs_usability_study_mode" + android:persistent="true" + android:defaultValue="false" /> + + + + + + \ No newline at end of file diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 488ab09c3..8f7278e3a 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -25,6 +25,7 @@ import android.app.AlertDialog; import android.app.Dialog; import android.app.backup.BackupManager; import android.content.DialogInterface; +import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.CheckBoxPreference; @@ -65,6 +66,7 @@ public class Settings extends PreferenceActivity public static final String PREF_SHOW_SUGGESTIONS_SETTING = "show_suggestions_setting"; public static final String PREF_AUTO_CORRECTION_THRESHOLD = "auto_correction_threshold"; public static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion"; + public static final String PREF_DEBUG_SETTINGS = "debug_settings"; public static final String PREF_USABILITY_STUDY_MODE = "usability_study_mode"; @@ -78,6 +80,7 @@ public class Settings extends PreferenceActivity private ListPreference mShowCorrectionSuggestionsPreference; private ListPreference mAutoCorrectionThreshold; private CheckBoxPreference mBigramSuggestion; + private Preference mDebugSettingsPreference; private boolean mVoiceOn; private AlertDialog mDialog; @@ -115,6 +118,13 @@ public class Settings extends PreferenceActivity mAutoCorrectionThreshold = (ListPreference) findPreference(PREF_AUTO_CORRECTION_THRESHOLD); mBigramSuggestion = (CheckBoxPreference) findPreference(PREF_BIGRAM_SUGGESTIONS); + mDebugSettingsPreference = findPreference(PREF_DEBUG_SETTINGS); + if (mDebugSettingsPreference != null) { + final Intent debugSettingsIntent = new Intent(Intent.ACTION_MAIN); + debugSettingsIntent.setClassName(getPackageName(), DebugSettings.class.getName()); + mDebugSettingsPreference.setIntent(debugSettingsIntent); + } + ensureConsistencyOfAutoCorrectionSettings(); final PreferenceGroup generalSettings = From fa62894c4b4b0a63553989c483cf2446641b9117 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Wed, 6 Apr 2011 13:51:45 -0700 Subject: [PATCH 3/3] Import revised translations. DO NOT MERGE Change-Id: Ica512df634b9152aac5bcd5f15d783110724fd7d --- java/res/values-fr/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml index b7aac9445..65e88c1ff 100644 --- a/java/res/values-fr/strings.xml +++ b/java/res/values-fr/strings.xml @@ -40,7 +40,7 @@ "Automatique" "Toujours afficher" "Toujours masquer" - "Correction auto" + "Correction auto." "Corriger autom. orthographe (pression sur barre espace/signes ponctuation)" "Désactiver" "Simple"