diff options
| author |   satok <satok@google.com> | 2010-09-07 15:37:32 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2010-09-07 15:37:32 +0900 |
| commit | e1cb2e4977b3fecd5622bd00d0db512333a628b8 (patch) | |
| tree | 7e7dc29de6127e045d29ba7d297cfb43dafebba0 /java/res | |
| parent | 6a454a9fa0a9b097d0237de989227e19ec427f47 (diff) | |
| parent | 36d2d0e736605141006108d573614ab3343a0600 (diff) | |
| download | latinime-e1cb2e4977b3fecd5622bd00d0db512333a628b8.tar.gz latinime-e1cb2e4977b3fecd5622bd00d0db512333a628b8.tar.xz latinime-e1cb2e4977b3fecd5622bd00d0db512333a628b8.zip | |
resolved conflicts for merge of 36d2d0e7 to master
Change-Id: Ib4b6ef593d7f4ce5b0666f2e0987ee8398cabe12
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/bools.xml | 1 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 7 |
3 files changed, 12 insertions, 0 deletions
diff --git a/java/res/values/bools.xml b/java/res/values/bools.xml index f5f2c3d0e..1f8051bfd 100644 --- a/java/res/values/bools.xml +++ b/java/res/values/bools.xml @@ -28,4 +28,5 @@ <bool name="config_swipeDisambiguation">true</bool> <!-- Whether or not Popup on key press is enabled by default --> <bool name="default_popup_preview">true</bool> + <bool name="default_recorrection_enabled">true</bool> </resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index cfdc44161..65b4c59a7 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -339,6 +339,10 @@ <string name="prefs_enable_log">Enable user feedback</string> <!-- Description for enabling to send user statistics to Google. --> <string name="prefs_description_log">Help improve this input method editor by automatically sending usage statistics and crash reports to Google.</string> + <!-- Preferences item for enabling to re-correct suggestions . --> + <string name="prefs_enable_recorrection">Tap to re-correction</string> + <!-- The summary for the preferences item for enabling to re-correct suggestions . --> + <string name="prefs_enable_recorrection_summary">You can re-correct words by tapping words you have typed</string> <!-- Description for keyboard theme switcher --> <string name="keyboard_layout">Keyboard Theme</string> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index be484b28f..a9ff8cabf 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -38,6 +38,13 @@ /> <CheckBoxPreference + android:key="recorrection_enabled" + android:title="@string/prefs_enable_recorrection" + android:persistent="true" + android:defaultValue="@bool/default_recorrection_enabled" + /> + + <CheckBoxPreference android:key="auto_cap" android:title="@string/auto_cap" android:persistent="true" |