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

Commit 27b2fa17 authored by Deepika Likhite's avatar Deepika Likhite Committed by Carmen Jackson
Browse files

Revert "Make getStateDescription() in View none final" 

This reverts commit c9cb2e83.

Reason for revert: <http://b/144786884>

Bug: 144786884

Exempt-From-Owner-Approval:see go/perf-revert-first

Change-Id: I0dd6047c2d3c8d757d8e1afe66d85a60075536b6
parent c9cb2e83

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -50659,7 +50659,7 @@ package android.view { 
    method public final int getScrollY();

    method @android.view.ViewDebug.ExportedProperty(category="drawing") @ColorInt public int getSolidColor();

    method @LayoutRes public int getSourceLayoutResId();

    method @android.view.ViewDebug.ExportedProperty(category="accessibility") @Nullable public CharSequence getStateDescription();

    method @android.view.ViewDebug.ExportedProperty(category="accessibility") @Nullable public final CharSequence getStateDescription();

    method public android.animation.StateListAnimator getStateListAnimator();

    method protected int getSuggestedMinimumHeight();

    method protected int getSuggestedMinimumWidth();

core/java/android/view/View.java

+7 −8
Original line number Diff line number Diff line
@@ -8727,7 +8727,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            structure.setContextClickable(true);

        }

        structure.setClassName(getAccessibilityClassName().toString());

        structure.setContentDescription(mContentDescription);

        structure.setContentDescription(getContentDescription());

    }















    /**










@@ -9934,8 +9934,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        info.setImportantForAccessibility(isImportantForAccessibility());















        info.setPackageName(mContext.getPackageName());















        info.setClassName(getAccessibilityClassName());













        info.setStateDescription(mStateDescription);













        info.setContentDescription(mContentDescription);













        info.setStateDescription(getStateDescription());













        info.setContentDescription(getContentDescription());





























        info.setEnabled(isEnabled());















        info.setClickable(isClickable());










@@ -10318,7 +10318,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * @see #setStateDescription(CharSequence)















     */















    @ViewDebug.ExportedProperty(category = "accessibility")













    public @Nullable CharSequence getStateDescription() {













    public final @Nullable CharSequence getStateDescription() {















        return mStateDescription;















    }
























@@ -13724,7 +13724,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     */















    @UnsupportedAppUsage















    public CharSequence getIterableTextForAccessibility() {













        return mContentDescription;













        return getContentDescription();















    }





























    /**










@@ -29514,10 +29514,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        stream.addProperty("text:textAlignment", getTextAlignment());





























        // accessibility













        CharSequence contentDescription = getContentDescription();















        stream.addProperty("accessibility:contentDescription",













                mContentDescription == null ? "" : mContentDescription.toString());













        stream.addProperty("accessibility:stateDescription",













                mStateDescription == null ? "" : mStateDescription.toString());













                contentDescription == null ? "" : contentDescription.toString());















        stream.addProperty("accessibility:labelFor", getLabelFor());















        stream.addProperty("accessibility:importantForAccessibility", getImportantForAccessibility());















    }