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

Commit d6a7e2e3 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am 9dc85a67: Merge "Configurable key long press timeout" 

# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '9dc85a67':
  Configurable key long press timeout
parents f5970c46 9dc85a67

java/res/values/attrs.xml

+2 −4
Original line number Diff line number Diff line
@@ -87,10 +87,8 @@ 
        <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 shift key to shift lock in millisecond. -->

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

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

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

        <!-- Layout resource for key press feedback.-->

java/res/values/config.xml

+6 −3
Original line number Diff line number Diff line
@@ -64,10 +64,13 @@ 
    <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>

    <integer name="config_default_longpress_key_timeout">300</integer>  <!-- milliseconds -->

    <integer name="config_longpress_timeout_step">10</integer> <!-- milliseconds -->

    <integer name="config_min_longpress_timeout">100</integer> <!-- milliseconds -->

    <integer name="config_max_longpress_timeout">700</integer> <!-- milliseconds -->

    <!-- 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>

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

    <integer name="config_longpress_shift_lock_timeout">1200</integer> <!-- milliseconds -->

    <integer name="config_ignore_alt_code_key_timeout">350</integer> <!-- milliseconds -->

    <!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if

         false -->

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

java/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -374,6 +374,8 @@ 


    <!-- Title of an option for usability study mode -->

    <string name="prefs_usability_study_mode">Usability study mode</string>

    <!-- Title of the settings for key long press delay -->

    <string name="prefs_key_longpress_timeout_settings">Key long press delay settings</string>

    <!-- Title of the settings for keypress vibration duration -->

    <string name="prefs_keypress_vibration_duration_settings">Keypress vibration duration settings</string>

    <!-- Title of the settings for keypress sound volume -->

java/res/values/styles.xml

+1 −2
Original line number Diff line number Diff line
@@ -80,8 +80,7 @@ 
        <item name="slidingKeyInputEnable">@bool/config_sliding_key_input_enabled</item>

        <item name="keyRepeatStartTimeout">@integer/config_key_repeat_start_timeout</item>

        <item name="keyRepeatInterval">@integer/config_key_repeat_interval</item>

        <item name="longPressKeyTimeout">@integer/config_long_press_key_timeout</item>

        <item name="longPressShiftKeyTimeout">@integer/config_long_press_shift_key_timeout</item>

        <item name="longPressShiftLockTimeout">@integer/config_longpress_shift_lock_timeout</item>

        <item name="ignoreAltCodeKeyTimeout">@integer/config_ignore_alt_code_key_timeout</item>

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

        <item name="keyPreviewOffset">@dimen/key_preview_offset</item>

java/res/xml/prefs.xml

+7 −0
Original line number Diff line number Diff line
@@ -145,6 +145,13 @@ 
            <ListPreference

                android:key="pref_key_preview_popup_dismiss_delay"

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

            <com.android.inputmethod.latin.SeekBarDialogPreference

                android:key="pref_key_longpress_timeout"

                android:title="@string/prefs_key_longpress_timeout_settings"

                latin:valueFormatText="@string/abbreviation_unit_milliseconds"

                latin:minValue="@integer/config_min_longpress_timeout"

                latin:maxValue="@integer/config_max_longpress_timeout"

                latin:stepValue="@integer/config_longpress_timeout_step" />

            <com.android.inputmethod.latin.SeekBarDialogPreference

                android:key="pref_vibration_duration_settings"

                android:title="@string/prefs_keypress_vibration_duration_settings"