diff options
Diffstat (limited to 'java/res')
-rw-r--r-- | java/res/layout/user_dictionary_item.xml | 61 | ||||
-rw-r--r-- | java/res/raw/main_ru.dict | bin | 2228285 -> 2229277 bytes | |||
-rw-r--r-- | java/res/values/config.xml | 1 | ||||
-rw-r--r-- | java/res/values/strings-appname.xml | 37 | ||||
-rw-r--r-- | java/res/values/strings.xml | 17 | ||||
-rw-r--r-- | java/res/values/styles.xml | 2 | ||||
-rw-r--r-- | java/res/xml/prefs.xml | 6 |
7 files changed, 81 insertions, 43 deletions
diff --git a/java/res/layout/user_dictionary_item.xml b/java/res/layout/user_dictionary_item.xml index 3062ed89a..56bad7743 100644 --- a/java/res/layout/user_dictionary_item.xml +++ b/java/res/layout/user_dictionary_item.xml @@ -13,40 +13,39 @@ See the License for the specific language governing permissions and limitations under the License. --> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" + android:background="?android:attr/selectableItemBackground" android:gravity="center_vertical" - android:paddingEnd="?android:attr/scrollbarSize" - android:background="?android:attr/selectableItemBackground" > - - <RelativeLayout android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="15dip" - android:layout_marginEnd="6dip" - android:layout_marginTop="6dip" - android:layout_marginBottom="6dip" - android:layout_weight="1"> - - <TextView android:id="@+android:id/text1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceMedium" - android:ellipsize="marquee" - android:fadingEdge="horizontal" /> - - <TextView android:id="@+android:id/text2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@android:id/text1" - android:layout_alignStart="@android:id/text1" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorSecondary" - android:maxLines="1" /> - - </RelativeLayout> + android:minHeight="?android:attr/listPreferredItemHeight" + android:paddingEnd="?android:attr/scrollbarSize" > + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="6dip" + android:layout_weight="1" > + + <TextView + android:id="@+android:id/text1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+android:id/text2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignStart="@android:id/text1" + android:layout_below="@android:id/text1" + android:maxLines="1" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="?android:attr/textColorSecondary" + android:visibility="gone" /> + </RelativeLayout> </LinearLayout> diff --git a/java/res/raw/main_ru.dict b/java/res/raw/main_ru.dict Binary files differindex 9fd613343..9bb780534 100644 --- a/java/res/raw/main_ru.dict +++ b/java/res/raw/main_ru.dict diff --git a/java/res/values/config.xml b/java/res/values/config.xml index f2e76bd29..5b11e0711 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -75,6 +75,7 @@ <!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if false --> <bool name="config_show_more_keys_keyboard_at_touched_point">false</bool> + <bool name="config_block_potentially_offensive">true</bool> <integer name="config_gesture_floating_preview_text_linger_timeout">200</integer> <integer name="config_gesture_preview_trail_fadeout_start_delay">100</integer> <integer name="config_gesture_preview_trail_fadeout_duration">800</integer> diff --git a/java/res/values/strings-appname.xml b/java/res/values/strings-appname.xml new file mode 100644 index 000000000..46d8c44ac --- /dev/null +++ b/java/res/values/strings-appname.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2013, 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. +*/ +--> + +<resources> + <!-- Application name for opensource Android keyboard. AOSP(Android Open Source Project) should not be translated. + This resource should be copied from msgid="8250992613616792321" --> + <string name="english_ime_name">Android Keyboard (AOSP)</string> + + <!-- Name of Android spell checker service. AOSP(Android Open Source Project) should not be translated. + This resource should be copied from msgid="511950477199948048" --> + <string name="spell_checker_service_name">Android Spell Checker (AOSP)</string> + + <!-- Title for Android Keyboard settings screen. AOSP(Android Open Source Project) should not be translated. + This resource should be copied from msgid="423615877174850267" --> + <string name="english_ime_settings">Android Keyboard Settings (AOSP)</string> + + <!-- Title for the spell checking service settings screen. AOSP(Android Open Source Project) should not be translated. + This resource should be copied from msgid="2970535894327288421" --> + <string name="android_spell_checker_settings">Android Spell Checker Settings (AOSP)</string> +</resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 14839397a..a5567daa7 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -18,18 +18,6 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Application name for opensource Android keyboard. AOSP(Android Open Source Project) should not be translated. --> - <string name="aosp_android_keyboard_ime_name">Android Keyboard (AOSP)</string> - - <!-- Title for Android Keyboard settings screen. AOSP(Android Open Source Project) should not be translated. --> - <string name="aosp_android_keyboard_ime_settings">Android Keyboard Settings (AOSP)</string> - - <!-- Name of Android spell checker service. AOSP(Android Open Source Project) should not be translated. --> - <string name="aosp_spell_checker_service_name">Android Spell Checker (AOSP)</string> - - <!-- Title for the spell checking service settings screen. AOSP(Android Open Source Project) should not be translated. --> - <string name="aosp_android_spell_checker_service_settings">Android Spell Checker Settings (AOSP)</string> - <!-- Title for Latin keyboard input options dialog [CHAR LIMIT=25] --> <string name="english_ime_input_options">Input options</string> @@ -123,6 +111,11 @@ <string name="prefs_suggestion_visibility_show_only_portrait_name">Show in portrait mode</string> <string name="prefs_suggestion_visibility_hide_name">Always hide</string> + <!-- Option to block potentially offensive words to be shown [CHAR_LIMIT=30] --> + <string name="prefs_block_potentially_offensive_title">Block offensive words</string> + <!-- Summary for option to block potentially offensive words to be shown [CHAR_LIMIT=80 (two lines) or 40 (fits on one line, preferable)] --> + <string name="prefs_block_potentially_offensive_summary">Do not suggest potentially offensive words</string> + <!-- Option to decide the auto correction threshold score --> <!-- Option to enable auto correction [CHAR LIMIT=20]--> <string name="auto_correction">Auto-correction</string> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 436e080f7..dad7e2064 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -94,8 +94,10 @@ <item name="showMoreKeysKeyboardAtTouchedPoint">@bool/config_show_more_keys_keyboard_at_touched_point</item> <item name="languageOnSpacebarFinalAlpha">@integer/config_language_on_spacebar_final_alpha</item> <item name="languageOnSpacebarFadeoutAnimator">@anim/language_on_spacebar_fadeout</item> + <!-- Remove animations for now because it could drain a non-negligible amount of battery while typing. <item name="altCodeKeyWhileTypingFadeoutAnimator">@anim/alt_code_key_while_typing_fadeout</item> <item name="altCodeKeyWhileTypingFadeinAnimator">@anim/alt_code_key_while_typing_fadein</item> + --> <!-- Common attributes of MainKeyboardView for gesture typing detection and recognition --> <item name="gestureFloatingPreviewTextLingerTimeout">@integer/config_gesture_floating_preview_text_linger_timeout</item> <item name="gestureStaticTimeThresholdAfterFastTyping">@integer/config_gesture_static_time_threshold_after_fast_typing</item> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index eea90f94b..51e3420e9 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -69,6 +69,12 @@ android:value="@string/dictionary_pack_client_id" /> </intent> </PreferenceScreen> + <CheckBoxPreference + android:key="pref_key_block_potentially_offensive" + android:title="@string/prefs_block_potentially_offensive_title" + android:summary="@string/prefs_block_potentially_offensive_summary" + android:persistent="true" + android:defaultValue="@bool/config_block_potentially_offensive" /> <ListPreference android:key="auto_correction_threshold" android:title="@string/auto_correction" |