diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-03-05 06:30:33 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-03-05 06:30:33 +0000 |
| commit | 249c887008272b9f9f01bad8ae83c204eceba6f3 (patch) | |
| tree | 8b1cd55895d89c8b91905fac45b77da9fd8ef38b /java/res | |
| parent | ff745e9a8adef082859dfbfa3ceeb16a0842980b (diff) | |
| parent | 84fa8043e6bef47378b3fc32c277e33034d5c174 (diff) | |
| download | latinime-249c887008272b9f9f01bad8ae83c204eceba6f3.tar.gz latinime-249c887008272b9f9f01bad8ae83c204eceba6f3.tar.xz latinime-249c887008272b9f9f01bad8ae83c204eceba6f3.zip | |
am 84fa8043: Merge "Add show setup wizard icon preference settings" into jb-mr2-dev
* commit '84fa8043e6bef47378b3fc32c277e33034d5c174':
Add show setup wizard icon preference settings
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 2a47d7afa..68fa8fd37 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -434,4 +434,6 @@ <string name="language_settings">Language & input</string> <!-- Title of the Input method picker. This should be aligned with msgid="4653387336791222978" --> <string name="select_input_method">Choose input method</string> + <!-- Option to show setup wizard icon. [CHAR LIMIT=30]--> + <string name="show_setup_wizard_icon" translatable="false">Show setup wizard icon</string> </resources> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 276395bad..e5fef8834 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -145,7 +145,7 @@ android:fragment="com.android.inputmethod.latin.AdditionalSubtypeSettings" android:key="custom_input_styles" android:title="@string/custom_input_styles_title" /> - <!-- Values for popup dismiss delay are added programatically --> + <!-- Values for popup dismiss delay are added programmatically --> <CheckBoxPreference android:key="pref_sliding_key_input_preview" android:title="@string/sliding_key_input_preview" @@ -171,6 +171,11 @@ android:key="pref_keypress_sound_volume" android:title="@string/prefs_keypress_sound_volume_settings" latin:maxValue="100" /> <!-- percent --> + <!-- The show setup wizard icon settings shouldn't be persistent and the default value + is added programmatically. --> + <CheckBoxPreference + android:key="pref_show_setup_wizard_icon" + android:title="@string/show_setup_wizard_icon" /> </PreferenceScreen> <PreferenceScreen android:key="debug_settings" |