Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 160f0121 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker 

This change introduces the following attributes.
 * KeyboardView
   - keyPreviewLingerTimeout
 * LatinKeboardView
   - keyHysteresisDistance
   - touchNoiseThresholdTime
   - touchNoiseThresholdDistance
   - slidingKeyInputEnable
   - keyRepeatStartTimeout
   - keyRepeatInterval
   - longPressKeyTimeout
   - longPressShiftKeyTimeout
   - longPressSpaceKeyTimeout
   - ignoreSpecialKeyTimeout
   - showMiniKeyboardAtTouchedPoint

Change-Id: I25159a87289b12447e20031add173523070e9b03
parent bcf2b793

java/res/values-sw600dp/config.xml

+6 −3
Original line number Diff line number Diff line
@@ -24,14 +24,11 @@ 
    <bool name="config_enable_show_voice_key_option">false</bool>

    <bool name="config_enable_show_popup_on_keypress_option">false</bool>

    <bool name="config_enable_bigram_suggestions_option">false</bool>

    <bool name="config_sliding_key_input_enabled">false</bool>

    <bool name="config_digit_more_keys_enabled">false</bool>

    <!-- Whether or not Popup on key press is enabled by default -->

    <bool name="config_default_popup_preview">false</bool>

    <bool name="config_default_sound_enabled">true</bool>

    <bool name="config_auto_correction_spacebar_led_enabled">false</bool>

    <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->

    <bool name="config_show_mini_keyboard_at_touched_point">true</bool>

    <!-- The language is never displayed if == 0, always displayed if < 0 -->

    <integer name="config_delay_before_fadeout_language_on_spacebar">1200</integer>

    <!-- Long pressing space will invoke IME switcher if > 0, never invoke IME switcher if == 0 -->
@@ -39,4 +36,10 @@ 
    <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->

    <string name="config_default_keyboard_theme_id" translatable="false">5</string>

    <integer name="config_max_more_keys_column">5</integer>

    <!--

        Configuration for LatinKeyboardView

    -->

    <bool name="config_sliding_key_input_enabled">false</bool>

    <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->

    <bool name="config_show_mini_keyboard_at_touched_point">true</bool>

</resources>

java/res/values-sw768dp/config.xml

+6 −3
Original line number Diff line number Diff line
@@ -24,19 +24,22 @@ 
    <bool name="config_enable_show_voice_key_option">false</bool>

    <bool name="config_enable_show_popup_on_keypress_option">false</bool>

    <bool name="config_enable_bigram_suggestions_option">false</bool>

    <bool name="config_sliding_key_input_enabled">false</bool>

    <bool name="config_digit_more_keys_enabled">false</bool>

    <!-- Whether or not Popup on key press is enabled by default -->

    <bool name="config_default_popup_preview">false</bool>

    <bool name="config_default_sound_enabled">true</bool>

    <bool name="config_auto_correction_spacebar_led_enabled">false</bool>

    <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->

    <bool name="config_show_mini_keyboard_at_touched_point">true</bool>

    <!-- Long pressing space will invoke IME switcher if > 0, never invoke IME switcher if == 0 -->

    <integer name="config_long_press_space_key_timeout">0</integer>

    <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->

    <string name="config_default_keyboard_theme_id" translatable="false">5</string>

    <integer name="config_max_more_keys_column">5</integer>

    <!--

        Configuration for LatinKeyboardView

    -->

    <bool name="config_sliding_key_input_enabled">false</bool>

    <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->

    <bool name="config_show_mini_keyboard_at_touched_point">true</bool>

    <!--  Screen metrics for logging.

            0 = "mdpi phone screen"

            1 = "hdpi phone screen"

java/res/values/attrs.xml

+24 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ 
        <attr name="keyPreviewHeight" format="dimension" />

        <!-- Size of the text for key press feedback popup, int the proportion of key height -->

        <attr name="keyPreviewTextRatio" format="float" />

        <!-- Delay after key releasing and key press feedback dismissing in millisecond -->

        <attr name="keyPreviewLingerTimeout" format="integer" />



        <!-- Amount to offset the touch Y coordinate by, for bias correction. -->

        <attr name="verticalCorrection" format="dimension" />
@@ -130,6 +132,28 @@ 
        <attr name="spacebarTextRatio" format="fraction" />

        <attr name="spacebarTextColor" format="color" />

        <attr name="spacebarTextShadowColor" format="color" />

        <!-- Key detection hysteresis distance. -->

        <attr name="keyHysteresisDistance" format="dimension" />

        <!-- Touch noise threshold time in millisecond -->

        <attr name="touchNoiseThresholdTime" format="integer" />

        <!-- Touch noise threshold distance in millimeter -->

        <attr name="touchNoiseThresholdDistance" format="dimension" />

        <!-- Sliding key input enable -->

        <attr name="slidingKeyInputEnable" format="boolean" />

        <!-- Key repeat start timeout -->

        <attr name="keyRepeatStartTimeout" format="integer" />

        <!-- Key repeat interval in millisecond. -->

        <attr name="keyRepeatInterval" format="integer" />

        <!-- Long press timeout of letter key in millisecond. -->

        <attr name="longPressKeyTimeout" format="integer" />

        <!-- Long press timeout of shift key in millisecond. -->

        <attr name="longPressShiftKeyTimeout" format="integer" />

        <!-- Long press timeout of space key in millisecond. -->

        <attr name="longPressSpaceKeyTimeout" format="integer" />

        <!-- Ignore special key timeout while typing in millisecond. -->

        <attr name="ignoreSpecialKeyTimeout" format="integer" />

        <!-- Mini-keyboard will shown at touched point. -->

        <attr name="showMiniKeyboardAtTouchedPoint" format="boolean" />

    </declare-styleable>



    <declare-styleable name="SuggestionsView">

java/res/values/config.xml

+22 −13
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
    <bool name="config_enable_bigram_suggestions_option">true</bool>

    <!-- TODO: Disable the following configuration for production. -->

    <bool name="config_enable_usability_study_mode_option">true</bool>

    <bool name="config_sliding_key_input_enabled">true</bool>

    <bool name="config_digit_more_keys_enabled">true</bool>

    <!-- Whether or not Popup on key press is enabled by default -->

    <bool name="config_default_popup_preview">true</bool>
@@ -39,8 +38,6 @@ 
    <bool name="config_default_bigram_prediction">false</bool>

    <bool name="config_default_sound_enabled">false</bool>

    <bool name="config_default_vibration_enabled">true</bool>

    <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->

    <bool name="config_show_mini_keyboard_at_touched_point">false</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>
@@ -48,26 +45,38 @@ 
    <integer name="config_delay_update_shift_state">100</integer>

    <integer name="config_duration_of_fadeout_language_on_spacebar">50</integer>

    <integer name="config_final_fadeout_percentage_of_language_on_spacebar">50</integer>

    <integer name="config_delay_before_preview">0</integer>

    <integer name="config_delay_after_preview">70</integer>

    <integer name="config_mini_keyboard_fadein_anim_time">0</integer>

    <integer name="config_mini_keyboard_fadeout_anim_time">100</integer>

    <integer name="config_delay_before_key_repeat_start">400</integer>

    <integer name="config_key_repeat_interval">50</integer>

    <integer name="config_keyboard_grid_width">32</integer>

    <integer name="config_keyboard_grid_height">16</integer>

    <integer name="config_double_spaces_turn_into_period_timeout">1100</integer>

    <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->

    <string name="config_default_keyboard_theme_id" translatable="false">5</string>

    <integer name="config_max_more_keys_column">5</integer>

    <!--

         Configuration for KeyboardView

    -->

    <integer name="config_key_preview_linger_timeout">70</integer>

    <!--

         Configuration for LatinKeyboardView

    -->

    <dimen name="config_key_hysteresis_distance">0.05in</dimen>

    <integer name="config_touch_noise_threshold_time">40</integer>

    <dimen name="config_touch_noise_threshold_distance">2.0mm</dimen>

    <bool name="config_sliding_key_input_enabled">true</bool>

    <integer name="config_key_repeat_start_timeout">400</integer>

    <integer name="config_key_repeat_interval">50</integer>

    <integer name="config_long_press_key_timeout">400</integer>

    <!-- Long pressing shift will invoke caps-lock if > 0, never invoke caps-lock if == 0 -->

    <integer name="config_long_press_shift_key_timeout">1200</integer>

    <!-- Long pressing space will invoke IME switcher if > 0, never invoke IME switcher if == 0 -->

    <integer name="config_long_press_space_key_timeout">@integer/config_long_press_key_timeout</integer>

    <integer name="config_touch_noise_threshold_millis">40</integer>

    <integer name="config_double_spaces_turn_into_period_timeout">1100</integer>

    <integer name="config_ignore_special_key_timeout">700</integer>

    <dimen name="config_touch_noise_threshold_distance">2.0mm</dimen>

    <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->

    <string name="config_default_keyboard_theme_id" translatable="false">5</string>

    <integer name="config_max_more_keys_column">5</integer>

    <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->

    <bool name="config_show_mini_keyboard_at_touched_point">false</bool>

    <!--

        Configuration for auto correction

     -->

    <string-array name="auto_correction_threshold_values" translatable="false">

        <!-- Off, When auto correction setting is Off, this value is not used. -->

        <item></item>

java/res/values/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -96,6 +96,4 @@ 
    <dimen name="more_suggestions_hint_text_size">27dip</dimen>

    <integer name="suggestions_count_in_strip">3</integer>

    <integer name="center_suggestion_percentile">36</integer>



    <dimen name="key_hysteresis_distance">0.05in</dimen>

</resources>