aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/attrs.xml8
-rw-r--r--java/res/values/config.xml4
-rw-r--r--java/res/values/styles.xml3
3 files changed, 11 insertions, 4 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index d47858d2e..d4a50b6cf 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -132,6 +132,14 @@
<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="finalFadeoutFactorOfLanguageOnSpacebar" format="float" />
<!-- Key detection hysteresis distance. -->
<attr name="keyHysteresisDistance" format="dimension" />
<!-- Touch noise threshold time in millisecond -->
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index dc4a4549a..a02b84ff0 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -35,13 +35,9 @@
<bool name="config_default_bigram_prediction">false</bool>
<bool name="config_default_sound_enabled">false</bool>
<bool name="config_default_vibration_enabled">true</bool>
- <!-- The language is never displayed if == 0, always displayed if < 0 -->
- <integer name="config_delay_before_fadeout_language_on_spacebar">1200</integer>
<integer name="config_delay_update_suggestions">100</integer>
<integer name="config_delay_update_old_suggestions">300</integer>
<integer name="config_delay_update_shift_state">100</integer>
- <integer name="config_duration_of_fadeout_language_on_spacebar">200</integer>
- <integer name="config_final_fadeout_percentage_of_language_on_spacebar">50</integer>
<integer name="config_more_keys_keyboard_fadein_anim_time">0</integer>
<integer name="config_more_keys_keyboard_fadeout_anim_time">100</integer>
<integer name="config_keyboard_grid_width">32</integer>
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index 228665953..eb2f9bb03 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -78,6 +78,9 @@
<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="finalFadeoutFactorOfLanguageOnSpacebar">0.5</item>
</style>
<style
name="LatinKeyboardView"