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

Commit 0ca18071 authored by Felipe Leme's avatar Felipe Leme
Browse files

Renaming leftover from previous CL... 

Test: echo 'In TreeHugger we trust!'

Bug: 71552872

Change-Id: I2b317c28cb7ec0e74b2cfa98338f9d64ff7dce3b
parent 61823f3a

core/java/android/widget/TextView.java

+9 −9
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


    // Indicates whether the text was set statically or dynamically, so it can be used to

    // sanitize autofill requests.

    private boolean mSetFromXmlOrResourceId = false;

    private boolean mTextSetFromXmlOrResourceId = false;

    // Resource id used to set the text - used for autofill purposes.

    private @StringRes int mTextId = ResourceId.ID_NULL;
@@ -930,7 +930,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        int n = a.getIndexCount();



        // Must set id in a temporary variable because it will be reset by setText()

        boolean setFromXml = false;

        boolean textIsSetFromXml = false;

        for (int i = 0; i < n; i++) {

            int attr = a.getIndex(i);
@@ -1072,7 +1072,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                    break;



                case com.android.internal.R.styleable.TextView_text:

                    setFromXml = true;

                    textIsSetFromXml = true;

                    mTextId = a.getResourceId(attr, ResourceId.ID_NULL);

                    text = a.getText(attr);

                    break;
@@ -1465,8 +1465,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        }



        setText(text, bufferType);

        if (setFromXml) {

            mSetFromXmlOrResourceId = true;

        if (textIsSetFromXml) {

            mTextSetFromXmlOrResourceId = true;

        }



        if (hint != null) setHint(hint);
@@ -5283,7 +5283,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


    private void setText(CharSequence text, BufferType type,

                         boolean notifyBefore, int oldlen) {

        mSetFromXmlOrResourceId = false;

        mTextSetFromXmlOrResourceId = false;

        if (text == null) {

            text = "";

        }
@@ -5521,7 +5521,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    @android.view.RemotableViewMethod

    public final void setText(@StringRes int resid) {

        setText(getContext().getResources().getText(resid));

        mSetFromXmlOrResourceId = true;

        mTextSetFromXmlOrResourceId = true;

        mTextId = resid;

    }
@@ -5549,7 +5549,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     */

    public final void setText(@StringRes int resid, BufferType type) {

        setText(getContext().getResources().getText(resid), type);

        mSetFromXmlOrResourceId = true;

        mTextSetFromXmlOrResourceId = true;

        mTextId = resid;

    }
@@ -10241,7 +10241,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        final boolean isPassword = hasPasswordTransformationMethod()

                || isPasswordInputType(getInputType());

        if (forAutofill) {

            structure.setDataIsSensitive(!mSetFromXmlOrResourceId);

            structure.setDataIsSensitive(!mTextSetFromXmlOrResourceId);

            if (mTextId != ResourceId.ID_NULL) {

                structure.setTextIdEntry(getResources().getResourceEntryName(mTextId));

            }