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

Commit 98fcc085 authored by Nikita Dubrovsky's avatar Nikita Dubrovsky
Browse files

Enable Content Capture for ImageViews by default 

Bug: 167712713
Test: atest CtsWidgetTestCases:ImageViewTest
Test: Manual
Change-Id: I5a77f5e19d6021e799c5fe13c4c9b71c039ff8dc
parent 677c97dd

core/java/android/widget/ImageView.java

+9 −5
Original line number Diff line number Diff line
@@ -196,11 +196,6 @@ public class ImageView extends View { 


        initImageView();



        // ImageView is not important by default, unless app developer overrode attribute.

        if (getImportantForAutofill() == IMPORTANT_FOR_AUTOFILL_AUTO) {

            setImportantForAutofill(IMPORTANT_FOR_AUTOFILL_NO);

        }



        final TypedArray a = context.obtainStyledAttributes(

                attrs, R.styleable.ImageView, defStyleAttr, defStyleRes);

        saveAttributeDataForStyleable(context, R.styleable.ImageView,
@@ -265,6 +260,15 @@ public class ImageView extends View { 
            sCompatDrawableVisibilityDispatch = targetSdkVersion < Build.VERSION_CODES.N;

            sCompatDone = true;

        }



        // By default, ImageView is not important for autofill but important for content capture.

        // Developers can override these defaults via the corresponding attributes.

        if (getImportantForAutofill() == IMPORTANT_FOR_AUTOFILL_AUTO) {

            setImportantForAutofill(IMPORTANT_FOR_AUTOFILL_NO);

        }

        if (getImportantForContentCapture() == IMPORTANT_FOR_CONTENT_CAPTURE_AUTO) {

            setImportantForContentCapture(IMPORTANT_FOR_CONTENT_CAPTURE_YES);

        }

    }



    @Override