diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/donottranslate-text-decorator.xml | 51 | ||||
| -rw-r--r-- | java/res/values/keyboard-themes.xml | 4 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 22 | ||||
| -rw-r--r-- | java/res/xml/keyboard_layout_set_qwerty.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/prefs_screen_accounts.xml | 37 | ||||
| -rw-r--r-- | java/res/xml/prefs_screen_appearance.xml | 5 |
7 files changed, 71 insertions, 54 deletions
diff --git a/java/res/values/donottranslate-text-decorator.xml b/java/res/values/donottranslate-text-decorator.xml index 832610b96..269364573 100644 --- a/java/res/values/donottranslate-text-decorator.xml +++ b/java/res/values/donottranslate-text-decorator.xml @@ -19,62 +19,11 @@ --> <resources> - <!-- The delay time in milliseconds from to show the commit indicator --> - <integer name="text_decorator_delay_in_milliseconds_to_show_commit_indicator"> - 500 - </integer> - <!-- The extra margin in dp around the hit area of the commit/add-to-dictionary indicator --> <integer name="text_decorator_hit_area_margin_in_dp"> 4 </integer> - <!-- If true, the commit/add-to-text indicator will be suppressed when the word isn't going to - trigger auto-correction. --> - <bool name="text_decorator_only_for_auto_correction">true</bool> - - <!-- If true, the commit/add-to-text indicator will be suppressed when the word is already in - the dictionary. --> - <bool name="text_decorator_only_for_out_of_vocabulary">false</bool> - - <!-- Background color to be used to highlight the target text when the commit indicator is - visible. --> - <color name="text_decorator_commit_indicator_text_highlight_color"> - #B6E2DE - </color> - - <!-- Background color of the commit indicator. --> - <color name="text_decorator_commit_indicator_background_color"> - #48B6AC - </color> - - <!-- Foreground color of the commit indicator. --> - <color name="text_decorator_commit_indicator_foreground_color"> - #FFFFFF - </color> - - <!-- Viewport size of "text_decorator_commit_indicator_path". --> - <integer name="text_decorator_commit_indicator_path_size"> - 480 - </integer> - - <!-- Coordinates of the closed path to be used to render the commit indicator. - The format is: X[0], Y[0], X[1], Y[1], ..., X[N-1], Y[N-1] --> - <integer-array name="text_decorator_commit_indicator_path"> - <item>180</item> - <item>323</item> - <item>97</item> - <item>240</item> - <item>68</item> - <item>268</item> - <item>180</item> - <item>380</item> - <item>420</item> - <item>140</item> - <item>392</item> - <item>112</item> - </integer-array> - <!-- Background color to be used to highlight the target text when the add-to-dictionary indicator is visible. --> <color name="text_decorator_add_to_dictionary_indicator_text_highlight_color"> diff --git a/java/res/values/keyboard-themes.xml b/java/res/values/keyboard-themes.xml index 9d772c4e7..b0bae9647 100644 --- a/java/res/values/keyboard-themes.xml +++ b/java/res/values/keyboard-themes.xml @@ -26,10 +26,10 @@ <item>@string/keyboard_theme_holo_blue</item> </string-array> <!-- An element must be a keyboard theme id of {@link KeyboardTheme#THEME_ID_*}. --> - <string-array name="keyboard_theme_ids" translatable="false"> + <integer-array name="keyboard_theme_ids" translatable="false"> <item>3</item> <item>4</item> <item>2</item> <item>0</item> - </string-array> + </integer-array> </resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index e5341f67a..d64444e01 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -38,6 +38,8 @@ <!-- Settings screen title for preferences [CHAR LIMIT=33]--> <string name="settings_screen_preferences">Preferences</string> + <!-- Settings screen title for accounts and privacy preferences [CHAR LIMIT=33]--> + <string name="settings_screen_accounts">Accounts & privacy</string> <!-- Settings screen title for appearance & layouts preferences [CHAR LIMIT=33] --> <string name="settings_screen_appearance">Appearance & layouts</string> <!-- Settings screen title for multilingual options [CHAR_LIMIT=33] --> @@ -51,6 +53,9 @@ <!-- Settings screen title for keyboard theme settings [CHAR LIMIT=33] --> <string name="settings_screen_theme">Theme</string> + <!-- Option for enabling or disabling the split keyboard layout. [CHAR LIMIT=65]--> + <string name="enable_split_keyboard">Enable split keyboard</string> + <!-- Option name for including other IMEs in the language switch list [CHAR LIMIT=30] --> <string name="include_other_imes_in_language_switch_list">Switch to other input methods</string> <!-- Option summary for including other IMEs in the language switch list [CHAR LIMIT=65] --> @@ -174,6 +179,23 @@ <!-- Title of the item to change the keyboard theme [CHAR LIMIT=20]--> <string name="keyboard_layout">Keyboard theme</string> + <!-- Title of the preference item for switching accounts [CHAR LIMIT=30] --> + <string name="switch_accounts">Switch accounts</string> + <!-- Summary of the preference item for switching accounts when no accounts + are selected [CHAR LIMIT=65] --> + <string name="no_accounts_selected">No accounts selected</string> + <!-- Summary of the preference item for switching accounts when an account + is selected [CHAR LIMIT=65] --> + <string name="account_selected">Currently using <xliff:g id="EMAIL_ADDRESS" example="someone@example.com">%1$s</xliff:g></string> + <!-- Positive text for selecting an account --> + <string name="account_select_ok">OK</string> + <!-- Negative text for selecting an account --> + <string name="account_select_cancel">Cancel</string> + <!-- Text for signing out of an account --> + <string name="account_select_sign_out">Sign out</string> + <!-- Title of the account picker dialog for selecting an account [CHAR LIMIT=40] --> + <string name="account_select_title">Select an account to use</string> + <!-- Description for English (UK) keyboard subtype [CHAR LIMIT=25] (UK) should be an abbreviation of United Kingdom to fit in the CHAR LIMIT. --> <string name="subtype_en_GB">English (UK)</string> diff --git a/java/res/xml/keyboard_layout_set_qwerty.xml b/java/res/xml/keyboard_layout_set_qwerty.xml index 1aa6f010a..7c9a1403e 100644 --- a/java/res/xml/keyboard_layout_set_qwerty.xml +++ b/java/res/xml/keyboard_layout_set_qwerty.xml @@ -24,7 +24,7 @@ latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwerty" latin:enableProximityCharsCorrection="true" - latin:supportsSplitLayout="false" /> + latin:supportsSplitLayout="true" /> <Element latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index c14cd645a..2a5134df6 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -23,6 +23,10 @@ android:title="@string/settings_screen_preferences" android:key="screen_preferences" /> <PreferenceScreen + android:fragment="com.android.inputmethod.latin.settings.AccountsSettingsFragment" + android:title="@string/settings_screen_accounts" + android:key="screen_accounts" /> + <PreferenceScreen android:fragment="com.android.inputmethod.latin.settings.AppearanceSettingsFragment" android:title="@string/settings_screen_appearance" android:key="screen_appearance" /> diff --git a/java/res/xml/prefs_screen_accounts.xml b/java/res/xml/prefs_screen_accounts.xml new file mode 100644 index 000000000..b5d526a3a --- /dev/null +++ b/java/res/xml/prefs_screen_accounts.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<PreferenceScreen + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + android:title="@string/settings_screen_accounts"> + + <!-- This preference is a dummy view of the underlying preference. + This isn't persisted and the summary/title is refreshed by the fragment + after inspecting the underlying account preference. --> + <Preference + android:key="account_switcher" + android:persistent="false" + android:title="@string/switch_accounts" + android:summary="@string/no_accounts_selected" /> + + <!-- title will be set programmatically to embed application name --> + <CheckBoxPreference + android:key="pref_enable_metrics_logging" + android:summary="@string/enable_metrics_logging_summary" + android:defaultValue="true" + android:persistent="true" /> +</PreferenceScreen> diff --git a/java/res/xml/prefs_screen_appearance.xml b/java/res/xml/prefs_screen_appearance.xml index 7719c058b..036b66553 100644 --- a/java/res/xml/prefs_screen_appearance.xml +++ b/java/res/xml/prefs_screen_appearance.xml @@ -26,4 +26,9 @@ android:fragment="com.android.inputmethod.latin.settings.CustomInputStyleSettingsFragment" android:key="custom_input_styles" android:title="@string/custom_input_styles_title" /> + <CheckBoxPreference + android:key="pref_split_keyboard" + android:title="@string/enable_split_keyboard" + android:persistent="true" + android:defaultValue="false" /> </PreferenceScreen> |