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

Commit 6b6f5b6d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix Annotations"

parents 07c6f4d4 596a6edd

api/current.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -50842,8 +50842,8 @@ package android.view { 
    method public final boolean startDragAndDrop(android.content.ClipData, android.view.View.DragShadowBuilder, Object, int);

    method public final boolean startDragAndDrop(android.content.ClipData, android.view.View.DragShadowBuilder, Object, int);

    method public boolean startNestedScroll(int);

    method public boolean startNestedScroll(int);

    method public void stopNestedScroll();

    method public void stopNestedScroll();

    method public void transformMatrixToGlobal(android.graphics.Matrix);

    method public void transformMatrixToGlobal(@NonNull android.graphics.Matrix);

    method public void transformMatrixToLocal(android.graphics.Matrix);

    method public void transformMatrixToLocal(@NonNull android.graphics.Matrix);

    method public void unscheduleDrawable(@NonNull android.graphics.drawable.Drawable, @NonNull Runnable);

    method public void unscheduleDrawable(@NonNull android.graphics.drawable.Drawable, @NonNull Runnable);

    method public void unscheduleDrawable(android.graphics.drawable.Drawable);

    method public void unscheduleDrawable(android.graphics.drawable.Drawable);

    method public final void updateDragShadow(android.view.View.DragShadowBuilder);

    method public final void updateDragShadow(android.view.View.DragShadowBuilder);
@@ -56267,7 +56267,7 @@ package android.widget { 
    method public String[] getDisplayedValues();

    method public String[] getDisplayedValues();

    method public int getMaxValue();

    method public int getMaxValue();

    method public int getMinValue();

    method public int getMinValue();

    method public int getSelectionDividerHeight();

    method @Px public int getSelectionDividerHeight();

    method @ColorInt public int getTextColor();

    method @ColorInt public int getTextColor();

    method @FloatRange(from=0.0, fromInclusive=false) public float getTextSize();

    method @FloatRange(from=0.0, fromInclusive=false) public float getTextSize();

    method public int getValue();

    method public int getValue();

core/java/android/view/View.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -24116,7 +24116,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     *

     *

     * @param matrix input matrix to modify

     * @param matrix input matrix to modify

     */

     */

    public void transformMatrixToGlobal(Matrix matrix) {

    public void transformMatrixToGlobal(@NonNull Matrix matrix) {

        final ViewParent parent = mParent;

        final ViewParent parent = mParent;

        if (parent instanceof View) {

        if (parent instanceof View) {

            final View vp = (View) parent;

            final View vp = (View) parent;
@@ -24141,7 +24141,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     *

     *

     * @param matrix input matrix to modify

     * @param matrix input matrix to modify

     */

     */

    public void transformMatrixToLocal(Matrix matrix) {

    public void transformMatrixToLocal(@NonNull Matrix matrix) {

        final ViewParent parent = mParent;

        final ViewParent parent = mParent;

        if (parent instanceof View) {

        if (parent instanceof View) {

            final View vp = (View) parent;

            final View vp = (View) parent;

core/java/android/widget/NumberPicker.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -1587,6 +1587,7 @@ public class NumberPicker extends LinearLayout { 
     * others.

     * others.

     * @return The height of the divider

     * @return The height of the divider

     */

     */

    @Px

    public int getSelectionDividerHeight() {

    public int getSelectionDividerHeight() {

        return mSelectionDividerHeight;

        return mSelectionDividerHeight;

    }

    }