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

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

am eb680367: Add keyHysteresisDistance xml attribute 

Merge commit 'eb680367' into gingerbread-plus-aosp

* commit 'eb680367':
  Add keyHysteresisDistance xml attribute
parents 2c424922 eb680367

java/res/layout/keyboard_popup.xml

+2 −0
Original line number Diff line number Diff line
@@ -33,5 +33,7 @@ 
            android:background="@drawable/keyboard_dark_background"



            latin:keyBackground="@drawable/btn_keyboard_key_gingerbread_popup"

            latin:keyHysteresisDistance="0dip"

            latin:verticalCorrection="-20dip"

            />

</LinearLayout>

java/res/values-land/dimens.xml

+4 −1
Original line number Diff line number Diff line
@@ -22,4 +22,7 @@ 
    <dimen name="key_height">47dip</dimen>

    <dimen name="candidate_strip_height">38dip</dimen>

    <dimen name="spacebar_vertical_correction">2dip</dimen>

    <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->

    <!-- key_height * 1.7 -->

    <dimen name="mini_keyboard_slide_allowance">79.9dip</dimen>

</resources>

java/res/values/attrs.xml

+3 −3
Original line number Diff line number Diff line
@@ -43,12 +43,12 @@ 
        <!-- Height of the key press feedback popup. -->

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



        <!-- Hysteresis distance for key debouncing -->

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



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

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



        <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->

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



        <!-- Layout resource for popup keyboards. -->

        <attr name="popupLayout" format="reference" />

java/res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -27,5 +27,7 @@ 
         will not go into extract (fullscreen) mode. -->

    <dimen name="max_height_for_fullscreen">2.5in</dimen>

    <dimen name="key_text_size">22sp</dimen>

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

    <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->

    <!-- key_height * 1.7 -->

    <dimen name="mini_keyboard_slide_allowance">91.8dip</dimen>

</resources>

java/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
        <item name="keyPreviewHeight">80dip</item>

        <item name="labelTextSize">14sp</item>

        <item name="popupLayout">@layout/keyboard_popup</item>

        <item name="keyHysteresisDistance">0.05in</item>

        <item name="verticalCorrection">-10dip</item>

        <item name="miniKeyboardSlideAllowance">40dip</item>

        <item name="shadowColor">#BB000000</item>

        <item name="shadowRadius">2.75</item>

        <item name="backgroundDimAmount">0.5</item>