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

Commit ba75b555 authored by Haoyu Zhang's avatar Haoyu Zhang
Browse files

Add public API TextView.isHorizontallyScrolling 

The original purpose is to remove @hide annotation on
TextView.getHorizontallyScrolling, but the function name conflicts
with our API naming convention. So, I created public API
isHorizontallyScrolling instead.

Bug: 117520716
Test: atest TextViewTest
Test: make offline-sdk-docs
Change-Id: I79666c8920cdfcb9dc68ae3701c6599f063df5fd
parent 00b10eff

api/current.txt

+4 −3
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ package android { 
    field public static final java.lang.String BROADCAST_SMS = "android.permission.BROADCAST_SMS";

    field public static final java.lang.String BROADCAST_STICKY = "android.permission.BROADCAST_STICKY";

    field public static final java.lang.String BROADCAST_WAP_PUSH = "android.permission.BROADCAST_WAP_PUSH";

    field public static final java.lang.String CALL_COMPANION_APP = "android.permission.CALL_COMPANION_APP";

    field public static final java.lang.String CALL_PHONE = "android.permission.CALL_PHONE";

    field public static final java.lang.String CALL_PRIVILEGED = "android.permission.CALL_PRIVILEGED";

    field public static final java.lang.String CAMERA = "android.permission.CAMERA";
@@ -91,7 +92,6 @@ package android { 
    field public static final java.lang.String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";

    field public static final java.lang.String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";

    field public static final java.lang.String MANAGE_OWN_CALLS = "android.permission.MANAGE_OWN_CALLS";

    field public static final java.lang.String CALL_COMPANION_APP = "android.permission.CALL_COMPANION_APP";

    field public static final java.lang.String MASTER_CLEAR = "android.permission.MASTER_CLEAR";

    field public static final java.lang.String MEDIA_CONTENT_CONTROL = "android.permission.MEDIA_CONTENT_CONTROL";

    field public static final java.lang.String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS";
@@ -43179,6 +43179,7 @@ package android.telecom { 
    field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";

    field public static final java.lang.String EXTRA_INCOMING_VIDEO_STATE = "android.telecom.extra.INCOMING_VIDEO_STATE";

    field public static final java.lang.String EXTRA_IS_DEFAULT_CALL_SCREENING_APP = "android.telecom.extra.IS_DEFAULT_CALL_SCREENING_APP";

    field public static final java.lang.String EXTRA_IS_ENABLED = "android.telecom.extra.IS_ENABLED";

    field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telecom.extra.NOTIFICATION_COUNT";

    field public static final java.lang.String EXTRA_NOTIFICATION_PHONE_NUMBER = "android.telecom.extra.NOTIFICATION_PHONE_NUMBER";

    field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";
@@ -43186,14 +43187,13 @@ package android.telecom { 
    field public static final java.lang.String EXTRA_START_CALL_WITH_RTT = "android.telecom.extra.START_CALL_WITH_RTT";

    field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";

    field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.telecom.extra.START_CALL_WITH_VIDEO_STATE";

    field public static final java.lang.String EXTRA_IS_ENABLED = "android.telecom.extra.IS_ENABLED";

    field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";

    field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";

    field public static final java.lang.String METADATA_INCLUDE_EXTERNAL_CALLS = "android.telecom.INCLUDE_EXTERNAL_CALLS";

    field public static final java.lang.String METADATA_INCLUDE_SELF_MANAGED_CALLS = "android.telecom.INCLUDE_SELF_MANAGED_CALLS";

    field public static final java.lang.String METADATA_IN_CALL_SERVICE_CAR_MODE_UI = "android.telecom.IN_CALL_SERVICE_CAR_MODE_UI";

    field public static final java.lang.String METADATA_IN_CALL_SERVICE_RINGING = "android.telecom.IN_CALL_SERVICE_RINGING";

    field public static final java.lang.String METADATA_IN_CALL_SERVICE_UI = "android.telecom.IN_CALL_SERVICE_UI";

    field public static final java.lang.String METADATA_IN_CALL_SERVICE_CAR_MODE_UI = "android.telecom.IN_CALL_SERVICE_CAR_MODE_UI";

    field public static final int PRESENTATION_ALLOWED = 1; // 0x1

    field public static final int PRESENTATION_PAYPHONE = 4; // 0x4

    field public static final int PRESENTATION_RESTRICTED = 2; // 0x2
@@ -56181,6 +56181,7 @@ package android.widget { 
    method public boolean isCursorVisible();

    method public boolean isElegantTextHeight();

    method public boolean isFallbackLineSpacing();

    method public final boolean isHorizontallyScrolling();

    method public boolean isInputMethodTarget();

    method public boolean isSingleLine();

    method public boolean isSuggestionsEnabled();

core/java/android/widget/TextView.java

+14 −3
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    @ViewDebug.ExportedProperty(category = "text")

    @UnsupportedAppUsage

    private int mGravity = Gravity.TOP | Gravity.START;

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    private boolean mHorizontallyScrolling;



    private int mAutoLinkMask;
@@ -5095,13 +5095,24 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    }



    /**

     * Returns whether the text is allowed to be wider than the View is.

     * Returns whether the text is allowed to be wider than the View.

     * If false, the text will be wrapped to the width of the View.

     *

     * @attr ref android.R.styleable#TextView_scrollHorizontally

     * @see #setHorizontallyScrolling(boolean)

     */

    public final boolean isHorizontallyScrolling() {

        return mHorizontallyScrolling;

    }



    /**

     * Returns whether the text is allowed to be wider than the View.

     * If false, the text will be wrapped to the width of the View.

     *

     * @attr ref android.R.styleable#TextView_scrollHorizontally

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public boolean getHorizontallyScrolling() {

        return mHorizontallyScrolling;

    }