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

Commit 9ce24968 authored by Aaron Whyte's avatar Aaron Whyte Committed by android-build-merger
Browse files

Merge "Split scroll factor into a 2d float." into oc-dev 

am: 774b1f1f

Change-Id: I1424f902aba4580258539db4327c66f4a4532045
parents 7cecad7b 774b1f1f

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -45973,6 +45973,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();
@@ -45991,7 +45992,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();
@@ -46000,6 +46000,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
@@ -49430,6 +49430,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();
@@ -49448,7 +49449,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();
@@ -49457,6 +49457,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
@@ -46350,6 +46350,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();
@@ -46372,7 +46373,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();
@@ -46381,6 +46381,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();