commit dabf96896ef4c304c6dad36b307a2a458a58209d
author Tadashi G. Takaoka <takaoka@google.com> Tue Mar 13 14:15:39 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Tue Mar 13 16:17:13 2012 +0900
tree 5db1e854d6f616f938778fce937ed4c85a51b0b8
parent 6fbcd0d21974611c1b6d8112c978e4c820747a3e

Move language on spacebar parameters to LatinKeyboardView attributes

Change-Id: I06e5d7d158a9b14b00df34e68b12cd012faf17d1

java/res/values/attrs.xml

diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index d47858d..d4a50b6 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 -->

java/res/values/config.xml

diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index dc4a454..a02b84f 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>

java/res/values/styles.xml

diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index 2286659..eb2f9bb 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"