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

Commit f830652e authored by Aaron Whyte's avatar Aaron Whyte
Browse files

Split scroll factor into a 2d float. 

Test: Existing unit tests, manual sanity check.
BUG=35764483

Change-Id: If6ac121452698747e1f8bc9d4ec0111bb881d4d4
(cherry picked from commit e9956c5c)
parent 84eecd25

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -45995,6 +45995,7 @@ package android.view { 
    method public static deprecated int getEdgeSlop();

    method public static deprecated int getFadingEdgeLength();

    method public static deprecated long getGlobalActionKeyTimeout();

    method public float getScaledHorizontalScrollFactor();

    method public static int getJumpTapTimeout();

    method public static int getKeyRepeatDelay();

    method public static int getKeyRepeatTimeout();
@@ -46013,7 +46014,6 @@ 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();
@@ -46022,6 +46022,7 @@ package android.view { 
    method public static float getScrollFriction();

    method public static int getTapTimeout();

    method public static deprecated int getTouchSlop();

    method public float getScaledVerticalScrollFactor();

    method public static deprecated int getWindowTouchSlop();

    method public static long getZoomControlsTimeout();

    method public boolean hasPermanentMenuKey();

api/removed.txt

+4 −0
Original line number Diff line number Diff line
@@ -374,6 +374,10 @@ package android.view { 
    method protected void initializeScrollbars(android.content.res.TypedArray);

  }



  public class ViewConfiguration {

    method public int getScaledScrollFactor();

  }



  public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable {

    field public static final int TYPE_KEYGUARD = 2004; // 0x7d4

  }

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -49450,6 +49450,7 @@ package android.view { 
    method public static deprecated int getEdgeSlop();

    method public static deprecated int getFadingEdgeLength();

    method public static deprecated long getGlobalActionKeyTimeout();

    method public float getScaledHorizontalScrollFactor();

    method public static int getJumpTapTimeout();

    method public static int getKeyRepeatDelay();

    method public static int getKeyRepeatTimeout();
@@ -49468,7 +49469,6 @@ 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();
@@ -49477,6 +49477,7 @@ package android.view { 
    method public static float getScrollFriction();

    method public static int getTapTimeout();

    method public static deprecated int getTouchSlop();

    method public float getScaledVerticalScrollFactor();

    method public static deprecated int getWindowTouchSlop();

    method public static long getZoomControlsTimeout();

    method public boolean hasPermanentMenuKey();

api/system-removed.txt

+4 −0
Original line number Diff line number Diff line
@@ -368,6 +368,10 @@ package android.view { 
    method protected void initializeScrollbars(android.content.res.TypedArray);

  }



  public class ViewConfiguration {

    method public int getScaledScrollFactor();

  }



  public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable {

    field public static final int TYPE_KEYGUARD = 2004; // 0x7d4

  }

api/test-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -46372,6 +46372,7 @@ package android.view { 
    method public static deprecated int getEdgeSlop();

    method public static deprecated int getFadingEdgeLength();

    method public static deprecated long getGlobalActionKeyTimeout();

    method public float getScaledHorizontalScrollFactor();

    method public static int getHoverTooltipHideShortTimeout();

    method public static int getHoverTooltipHideTimeout();

    method public static int getHoverTooltipShowTimeout();
@@ -46394,7 +46395,6 @@ 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();
@@ -46403,6 +46403,7 @@ package android.view { 
    method public static float getScrollFriction();

    method public static int getTapTimeout();

    method public static deprecated int getTouchSlop();

    method public float getScaledVerticalScrollFactor();

    method public static deprecated int getWindowTouchSlop();

    method public static long getZoomControlsTimeout();

    method public boolean hasPermanentMenuKey();