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

Commit 5f81193f authored by Mindy Pereira's avatar Mindy Pereira Committed by Android Git Automerger
Browse files

am ed7e36dc: am d5e92318: Merge "Update fling min velocity" into klp-modular-dev 

* commit 'ed7e36dc':
  Update fling min velocity
parents 99013a24 ed7e36dc

core/java/android/view/ViewConfiguration.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -287,8 +287,6 @@ public class ViewConfiguration { 




        mEdgeSlop = (int) (sizeAndDensity * EDGE_SLOP + 0.5f);

        mEdgeSlop = (int) (sizeAndDensity * EDGE_SLOP + 0.5f);

        mFadingEdgeLength = (int) (sizeAndDensity * FADING_EDGE_LENGTH + 0.5f);

        mFadingEdgeLength = (int) (sizeAndDensity * FADING_EDGE_LENGTH + 0.5f);

        mMinimumFlingVelocity = (int) (density * MINIMUM_FLING_VELOCITY + 0.5f);

        mMaximumFlingVelocity = (int) (density * MAXIMUM_FLING_VELOCITY + 0.5f);

        mScrollbarSize = (int) (density * SCROLL_BAR_SIZE + 0.5f);

        mScrollbarSize = (int) (density * SCROLL_BAR_SIZE + 0.5f);

        mDoubleTapSlop = (int) (sizeAndDensity * DOUBLE_TAP_SLOP + 0.5f);

        mDoubleTapSlop = (int) (sizeAndDensity * DOUBLE_TAP_SLOP + 0.5f);

        mWindowTouchSlop = (int) (sizeAndDensity * WINDOW_TOUCH_SLOP + 0.5f);

        mWindowTouchSlop = (int) (sizeAndDensity * WINDOW_TOUCH_SLOP + 0.5f);
@@ -339,6 +337,11 @@ public class ViewConfiguration { 
        mPagingTouchSlop = mTouchSlop * 2;

        mPagingTouchSlop = mTouchSlop * 2;





        mDoubleTapTouchSlop = mTouchSlop;

        mDoubleTapTouchSlop = mTouchSlop;



        mMinimumFlingVelocity = res.getDimensionPixelSize(

                com.android.internal.R.dimen.config_viewMinFlingVelocity);

        mMaximumFlingVelocity = res.getDimensionPixelSize(

                com.android.internal.R.dimen.config_viewMaxFlingVelocity);

    }

    }





    /**

    /**

core/res/res/values-watch/config.xml

+7 −0
Original line number Original line Diff line number Diff line
@@ -30,4 +30,11 @@ 
    <!-- Base "touch slop" value used by ViewConfiguration as a

    <!-- Base "touch slop" value used by ViewConfiguration as a

         movement threshold where scrolling should begin. -->

         movement threshold where scrolling should begin. -->

    <dimen name="config_viewConfigurationTouchSlop">4dp</dimen>

    <dimen name="config_viewConfigurationTouchSlop">4dp</dimen>



    <!-- Minimum velocity to initiate a fling, as measured in dips per second. -->

    <dimen name="config_viewMinFlingVelocity">50dp</dimen>



    <!-- Maximum velocity to initiate a fling, as measured in dips per second. -->

    <dimen name="config_viewMaxFlingVelocity">8000dp</dimen>



</resources>
 
</resources>

core/res/res/values/config.xml

+6 −0
Original line number Original line Diff line number Diff line
@@ -1206,6 +1206,12 @@ 
         movement threshold where scrolling should begin. -->

         movement threshold where scrolling should begin. -->

    <dimen name="config_viewConfigurationTouchSlop">8dp</dimen>

    <dimen name="config_viewConfigurationTouchSlop">8dp</dimen>





    <!-- Minimum velocity to initiate a fling, as measured in dips per second. -->

    <dimen name="config_viewMinFlingVelocity">50dp</dimen>



    <!-- Maximum velocity to initiate a fling, as measured in dips per second. -->

    <dimen name="config_viewMaxFlingVelocity">8000dp</dimen>



    <!-- Maximum number of grid columns permitted in the ResolverActivity

    <!-- Maximum number of grid columns permitted in the ResolverActivity

         used for picking activities to handle an intent. -->

         used for picking activities to handle an intent. -->

    <integer name="config_maxResolverActivityColumns">2</integer>

    <integer name="config_maxResolverActivityColumns">2</integer>

core/res/res/values/symbols.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -328,6 +328,8 @@ 
  <java-symbol type="dimen" name="accessibility_touch_slop" />

  <java-symbol type="dimen" name="accessibility_touch_slop" />

  <java-symbol type="dimen" name="config_prefDialogWidth" />

  <java-symbol type="dimen" name="config_prefDialogWidth" />

  <java-symbol type="dimen" name="config_viewConfigurationTouchSlop" />

  <java-symbol type="dimen" name="config_viewConfigurationTouchSlop" />

  <java-symbol type="dimen" name="config_viewMinFlingVelocity" />

  <java-symbol type="dimen" name="config_viewMaxFlingVelocity" />

  <java-symbol type="dimen" name="default_app_widget_padding_bottom" />

  <java-symbol type="dimen" name="default_app_widget_padding_bottom" />

  <java-symbol type="dimen" name="default_app_widget_padding_left" />

  <java-symbol type="dimen" name="default_app_widget_padding_left" />

  <java-symbol type="dimen" name="default_app_widget_padding_right" />

  <java-symbol type="dimen" name="default_app_widget_padding_right" />