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

Commit d04c47a2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Visit URIs in themed remoteviews icons." into sc-dev am: ee97e947 am: a8aa3bc5 

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



Change-Id: I500687acc2175b662b5ff2ccd0798f6d896ed951
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 182640fb a8aa3bc5

core/java/android/widget/RemoteViews.java

+9 −1
Original line number Diff line number Diff line
@@ -1808,7 +1808,7 @@ public class RemoteViews implements Parcelable, Filter { 
        }



        @Override

        public final void visitUris(@NonNull Consumer<Uri> visitor) {

        public void visitUris(@NonNull Consumer<Uri> visitor) {

            switch (this.type) {

                case URI:

                    final Uri uri = (Uri) getParameterValue(null);
@@ -2271,6 +2271,14 @@ public class RemoteViews implements Parcelable, Filter { 
        public int getActionTag() {

            return NIGHT_MODE_REFLECTION_ACTION_TAG;

        }



        @Override

        public void visitUris(@NonNull Consumer<Uri> visitor) {

            if (this.type == ICON) {

                visitIconUri((Icon) mDarkValue, visitor);

                visitIconUri((Icon) mLightValue, visitor);

            }

        }

    }



    /**

core/tests/coretests/src/android/widget/RemoteViewsTest.java

+13 −0
Original line number Diff line number Diff line
@@ -530,6 +530,19 @@ public class RemoteViewsTest { 
        verify(visitor, times(1)).accept(eq(icon4.getUri()));

    }



    @Test

    public void visitUris_themedIcons() {

        RemoteViews views = new RemoteViews(mPackage, R.layout.remote_views_test);

        final Icon iconLight = Icon.createWithContentUri("content://light/icon");

        final Icon iconDark = Icon.createWithContentUri("content://dark/icon");

        views.setIcon(R.id.layout, "setLargeIcon", iconLight, iconDark);



        Consumer<Uri> visitor = (Consumer<Uri>) spy(Consumer.class);

        views.visitUris(visitor);

        verify(visitor, times(1)).accept(eq(iconLight.getUri()));

        verify(visitor, times(1)).accept(eq(iconDark.getUri()));

    }



    @Test

    public void visitUris_nestedViews() {

        final RemoteViews outer = new RemoteViews(mPackage, R.layout.remote_views_test);