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

Commit 83845538 authored by Alex Salo's avatar Alex Salo Committed by Automerger Merge Worker
Browse files

Merge "Make disabled EditTexts fillable by Autofill" into udc-qpr-dev am: 7bdee559 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24604704



Change-Id: I48329eae674e39d8b2c5f23475ae7c8401b4fda0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9b366e72 7bdee559

core/java/android/widget/TextView.java

+12 −3
Original line number Diff line number Diff line
@@ -12887,6 +12887,15 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        return mText instanceof Editable && onCheckIsTextEditor() && isEnabled();

    }













    /**













     * @return true if this TextView could be filled by an Autofill service. Note that disabled













     * fields can still be filled.













     */













    @UnsupportedAppUsage













    boolean isTextAutofillable() {













        return mText instanceof Editable && onCheckIsTextEditor();













    }



























    /**















     * Returns true, only while processing a touch gesture, if the initial















     * touch down event caused focus to move to the text view and as a result










@@ -13610,7 +13619,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener



























    @Override















    public void autofill(AutofillValue value) {













        if (!isTextEditable()) {













        if (!isTextAutofillable()) {















            Log.w(LOG_TAG, "cannot autofill non-editable TextView: " + this);















            return;















        }









@@ -13626,7 +13635,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener



























    @Override















    public @AutofillType int getAutofillType() {













        return isTextEditable() ? AUTOFILL_TYPE_TEXT : AUTOFILL_TYPE_NONE;













        return isTextAutofillable() ? AUTOFILL_TYPE_TEXT : AUTOFILL_TYPE_NONE;















    }





























    /**









@@ -13640,7 +13649,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener













    @Override















    @Nullable















    public AutofillValue getAutofillValue() {













        if (isTextEditable()) {













        if (isTextAutofillable()) {















            final CharSequence text = TextUtils.trimToParcelableSize(getText());















            return AutofillValue.forText(text);















        }