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

Commit b092aef4 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Remove key show up and dismiss animation"

parents ffde401b c9072dc8

java/res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ 
        <attr name="keyPreviewOffset" format="dimension" />

        <!-- Height of the key press feedback popup. -->

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

        <!-- TODO: consolidate key preview linger timeout with the key preview animation parameters. -->

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

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

        <!-- Layout resource for more keys keyboard -->

java/res/values/config-common.xml

+5 −4
Original line number Diff line number Diff line
@@ -35,10 +35,11 @@ 


    <integer name="config_ignore_alt_code_key_timeout">350</integer>



    <integer name="config_key_preview_show_up_duration">35</integer>

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

    <fraction name="config_key_preview_show_up_start_scale">70%</fraction>

    <fraction name="config_key_preview_dismiss_end_scale">70%</fraction>

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

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

    <fraction name="config_key_preview_show_up_start_scale">100%</fraction>

    <fraction name="config_key_preview_dismiss_end_scale">100%</fraction>

    <!-- TODO: consolidate key preview linger timeout with the above animation parameters. -->

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

    <!-- Suppress showing key preview duration after batch input in millisecond -->

    <integer name="config_suppress_key_preview_after_batch_input_duration">1000</integer>

java/res/values/themes-common.xml

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
        <item name="ignoreAltCodeKeyTimeout">@integer/config_ignore_alt_code_key_timeout</item>

        <item name="keyPreviewLayout">@layout/key_preview</item>

        <item name="keyPreviewHeight">@dimen/config_key_preview_height</item>

        <!-- TODO: consolidate key preview linger timeout with the key preview animation parameters. -->

        <item name="keyPreviewLingerTimeout">@integer/config_key_preview_linger_timeout</item>

        <item name="moreKeysKeyboardLayout">@layout/more_keys_keyboard</item>

        <item name="showMoreKeysKeyboardAtTouchedPoint">@bool/config_show_more_keys_keyboard_at_touched_point</item>

java/res/xml/prefs.xml

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ 
                android:fragment="com.android.inputmethod.latin.settings.AdditionalSubtypeSettings"

                android:key="custom_input_styles"

                android:title="@string/custom_input_styles_title" />

            <!-- TODO: consolidate key preview dismiss delay with the key preview animation parameters. -->

            <ListPreference

                android:key="pref_key_preview_popup_dismiss_delay"

                android:title="@string/key_preview_popup_dismiss_delay" />

java/src/com/android/inputmethod/latin/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang 
            "pref_include_other_imes_in_language_switch_list";

    public static final String PREF_KEYBOARD_LAYOUT = "pref_keyboard_layout_20110916";

    public static final String PREF_CUSTOM_INPUT_STYLES = "custom_input_styles";

    // TODO: consolidate key preview dismiss delay with the key preview animation parameters.

    public static final String PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY =

            "pref_key_preview_popup_dismiss_delay";

    public static final String PREF_BIGRAM_PREDICTIONS = "next_word_prediction";