diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/anim/language_on_spacebar_fadeout.xml | 27 | ||||
| -rw-r--r-- | java/res/values/attrs.xml | 10 | ||||
| -rw-r--r-- | java/res/values/styles.xml | 4 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/key_styles_common.xml | 4 | ||||
| -rw-r--r-- | java/res/xml-sw768dp/key_styles_common.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 2 |
6 files changed, 32 insertions, 19 deletions
diff --git a/java/res/anim/language_on_spacebar_fadeout.xml b/java/res/anim/language_on_spacebar_fadeout.xml new file mode 100644 index 000000000..f66e1627b --- /dev/null +++ b/java/res/anim/language_on_spacebar_fadeout.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> + +<animator + xmlns:android="http://schemas.android.com/apk/res/android" + android:valueType="intType" + android:startOffset="1200" + android:duration="200" + android:valueFrom="255" + android:valueTo="128" /> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 8df51d648..e56778a69 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -132,14 +132,8 @@ <attr name="spacebarTextRatio" format="fraction" /> <attr name="spacebarTextColor" format="color" /> <attr name="spacebarTextShadowColor" format="color" /> - <!-- Animation parameters for spacebar language label. --> - <attr name="durationOfFadeoutLanguageOnSpacebar" format="integer|enum"> - <!-- This should be aligned with LatinKeyboardView.LANGUAGE_ON_SPACEBAR_* --> - <enum name="neverDisplay" value="0" /> - <enum name="alwaysDisplay" value="-1" /> - </attr> - <attr name="delayBeforeFadeoutLangageOnSpacebar" format="integer" /> - <attr name="finalAlphaOfLanguageOnSpacebar" format="integer" /> + <!-- Fadeout animator for spacebar language label. --> + <attr name="languageOnSpacebarFadeoutAnimator" format="reference" /> <!-- Key detection hysteresis distance. --> <attr name="keyHysteresisDistance" format="dimension" /> <!-- Touch noise threshold time in millisecond --> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index eaca642b6..741ad99c9 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -78,9 +78,7 @@ <item name="longPressSpaceKeyTimeout">@integer/config_long_press_space_key_timeout</item> <item name="ignoreSpecialKeyTimeout">@integer/config_ignore_special_key_timeout</item> <item name="showMoreKeysKeyboardAtTouchedPoint">@bool/config_show_more_keys_keyboard_at_touched_point</item> - <item name="durationOfFadeoutLanguageOnSpacebar">200</item> - <item name="delayBeforeFadeoutLangageOnSpacebar">1200</item> - <item name="finalAlphaOfLanguageOnSpacebar">128</item> + <item name="languageOnSpacebarFadeoutAnimator">@anim/language_on_spacebar_fadeout</item> </style> <style name="LatinKeyboardView" diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml index b206f0e54..a263acd9b 100644 --- a/java/res/xml-sw600dp/key_styles_common.xml +++ b/java/res/xml-sw600dp/key_styles_common.xml @@ -82,9 +82,7 @@ latin:styleName="zwnjKeyStyle" latin:keyLabel="‌" latin:moreKeys="‍" - latin:keyLabelFlags="hasPopupHint" - latin:altCode="@integer/key_space" - latin:keyActionFlags="altCodeWhileTyping" /> + latin:keyLabelFlags="hasPopupHint" /> <key-style latin:styleName="smileyKeyStyle" latin:keyLabel=":-)" diff --git a/java/res/xml-sw768dp/key_styles_common.xml b/java/res/xml-sw768dp/key_styles_common.xml index 069fc63b9..fade151ed 100644 --- a/java/res/xml-sw768dp/key_styles_common.xml +++ b/java/res/xml-sw768dp/key_styles_common.xml @@ -81,9 +81,7 @@ latin:styleName="zwnjKeyStyle" latin:keyLabel="‌" latin:moreKeys="‍" - latin:keyLabelFlags="hasPopupHint" - latin:altCode="@integer/key_space" - latin:keyActionFlags="altCodeWhileTyping" /> + latin:keyLabelFlags="hasPopupHint" /> <key-style latin:styleName="smileyKeyStyle" latin:keyLabel=":-)" diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index 7b526c07f..087b8952f 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -112,8 +112,6 @@ latin:keyLabel="‌" latin:moreKeys="‍" latin:keyLabelFlags="hasPopupHint" - latin:altCode="@integer/key_space" - latin:keyActionFlags="altCodeWhileTyping" latin:backgroundType="functional" /> <key-style latin:styleName="shortcutKeyStyle" |