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

Commit be92fca2 authored by Ned Burns's avatar Ned Burns Committed by Android (Google) Code Review
Browse files

Merge "Add ViewConfiguration.getScaledScrollFactor()"

parents 75e983f2 69af4320

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -43176,6 +43176,7 @@ package android.view { 
    method public int getScaledOverscrollDistance();

    method public int getScaledPagingTouchSlop();

    method public int getScaledScrollBarSize();

    method public int getScaledScrollFactor();

    method public int getScaledTouchSlop();

    method public int getScaledWindowTouchSlop();

    method public static int getScrollBarFadeDuration();

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -46346,6 +46346,7 @@ package android.view { 
    method public int getScaledOverscrollDistance();

    method public int getScaledPagingTouchSlop();

    method public int getScaledScrollBarSize();

    method public int getScaledScrollFactor();

    method public int getScaledTouchSlop();

    method public int getScaledWindowTouchSlop();

    method public static int getScrollBarFadeDuration();

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -43257,6 +43257,7 @@ package android.view { 
    method public int getScaledOverscrollDistance();

    method public int getScaledPagingTouchSlop();

    method public int getScaledScrollBarSize();

    method public int getScaledScrollFactor();

    method public int getScaledTouchSlop();

    method public int getScaledWindowTouchSlop();

    method public static int getScrollBarFadeDuration();

core/java/android/view/ViewConfiguration.java

+18 −0
Original line number Diff line number Diff line
@@ -218,6 +218,12 @@ public class ViewConfiguration { 
     */

    private static final int OVERFLING_DISTANCE = 6;



    /**

     * Amount to scroll in response to a {@link MotionEvent#ACTION_SCROLL} event, in dips per

     * axis value.

     */

    private static final int SCROLL_FACTOR = 64;



    /**

     * Default duration to hide an action mode for.

     */
@@ -246,6 +252,7 @@ public class ViewConfiguration { 
    private final int mOverflingDistance;

    private final boolean mFadingMarqueeEnabled;

    private final long mGlobalActionsKeyTimeout;

    private final int mScrollFactor;



    private boolean sHasPermanentMenuKey;

    private boolean sHasPermanentMenuKeySet;
@@ -274,6 +281,7 @@ public class ViewConfiguration { 
        mOverflingDistance = OVERFLING_DISTANCE;

        mFadingMarqueeEnabled = true;

        mGlobalActionsKeyTimeout = GLOBAL_ACTIONS_KEY_TIMEOUT;

        mScrollFactor = SCROLL_FACTOR;

    }



    /**
@@ -357,6 +365,8 @@ public class ViewConfiguration { 
                com.android.internal.R.dimen.config_viewMaxFlingVelocity);

        mGlobalActionsKeyTimeout = res.getInteger(

                com.android.internal.R.integer.config_globalActionsKeyTimeout);

        mScrollFactor = res.getDimensionPixelSize(

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

    }



    /**
@@ -668,6 +678,14 @@ public class ViewConfiguration { 
        return mMaximumFlingVelocity;

    }



    /**

     * @return Amount to scroll in response to a {@link MotionEvent#ACTION_SCROLL} event. Multiply

     * this by the event's axis value to obtain the number of pixels to be scrolled.

     */

    public int getScaledScrollFactor() {

        return mScrollFactor;

    }



    /**

     * The maximum drawing cache size expressed in bytes.

     *

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -1764,6 +1764,10 @@ 
    <!-- Amount of time in ms the user needs to press the relevant key to bring up the global actions dialog -->

    <integer name="config_globalActionsKeyTimeout">500</integer>



    <!-- Distance that should be scrolled in response to a {@link MotionEvent#ACTION_SCROLL event}

         with an axis value of 1. -->

    <dimen name="config_scrollFactor">64dp</dimen>



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

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

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