Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Visit URIs in themed remoteviews icons." into sc-dev am: ee97e94714 am: a8aa3bc51b am: d04c47a298 am: be93a4209b am: 7fd3c9df49

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

Change-Id: I6e3ecf658ca27d7e94b5cc5a045a4bd8fda7bc79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-31 00:04:38 +00:00
committed by Automerger Merge Worker
parent 6fe1704881 7fd3c9df49
commit 3002fcb3ac
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/widget/RemoteViews.java
View File

@@ -1830,7 +1830,7 @@ public class RemoteViews implements Parcelable, Filter {
} }
@Override @Override
public final void visitUris(@NonNull Consumer<Uri> visitor) { public void visitUris(@NonNull Consumer<Uri> visitor) {
switch (this.type) { switch (this.type) {
case URI: case URI:
final Uri uri = (Uri) getParameterValue(null); final Uri uri = (Uri) getParameterValue(null);
@@ -2293,6 +2293,14 @@ public class RemoteViews implements Parcelable, Filter {
public int getActionTag() { public int getActionTag() {
return NIGHT_MODE_REFLECTION_ACTION_TAG; 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);
}
}
} }
/** /**

13
core/tests/coretests/src/android/widget/RemoteViewsTest.java
View File

@@ -719,6 +719,19 @@ public class RemoteViewsTest {
verify(visitor, times(1)).accept(eq(icon4.getUri())); 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 @Test
public void visitUris_nestedViews() { public void visitUris_nestedViews() {
final RemoteViews outer = new RemoteViews(mPackage, R.layout.remote_views_test); final RemoteViews outer = new RemoteViews(mPackage, R.layout.remote_views_test);