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

Merge "Implement visitUris for RemoteViews ViewGroupActionAdd." into udc-dev am: 8bcbcdd7d3

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

Change-Id: I2f148a9470e3d9a35325fb1f0486c08a06be24de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ioana Alexandru
2023-05-23 13:38:13 +00:00
committed by Automerger Merge Worker
parent 5791f14a9d 8bcbcdd7d3
commit db9bad4486
3 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2598,6 +2598,11 @@ public class RemoteViews implements Parcelable, Filter {
public int getActionTag() { public int getActionTag() {
return VIEW_GROUP_ACTION_ADD_TAG; return VIEW_GROUP_ACTION_ADD_TAG;
} }
@Override
public final void visitUris(@NonNull Consumer<Uri> visitor) {
mNestedViews.visitUris(visitor);
}
} }
/** /**

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

@@ -715,6 +715,30 @@ public class RemoteViewsTest {
verify(visitor, times(1)).accept(eq(icon4.getUri())); verify(visitor, times(1)).accept(eq(icon4.getUri()));
} }
@Test
public void visitUris_nestedViews() {
final RemoteViews outer = new RemoteViews(mPackage, R.layout.remote_views_test);
final RemoteViews inner = new RemoteViews(mPackage, 33);
final Uri imageUriI = Uri.parse("content://inner/image");
final Icon icon1 = Icon.createWithContentUri("content://inner/icon1");
final Icon icon2 = Icon.createWithContentUri("content://inner/icon2");
final Icon icon3 = Icon.createWithContentUri("content://inner/icon3");
final Icon icon4 = Icon.createWithContentUri("content://inner/icon4");
inner.setImageViewUri(R.id.image, imageUriI);
inner.setTextViewCompoundDrawables(R.id.text, icon1, icon2, icon3, icon4);
outer.addView(R.id.layout, inner);
Consumer<Uri> visitor = (Consumer<Uri>) spy(Consumer.class);
outer.visitUris(visitor);
verify(visitor, times(1)).accept(eq(imageUriI));
verify(visitor, times(1)).accept(eq(icon1.getUri()));
verify(visitor, times(1)).accept(eq(icon2.getUri()));
verify(visitor, times(1)).accept(eq(icon3.getUri()));
verify(visitor, times(1)).accept(eq(icon4.getUri()));
}
@Test @Test
public void visitUris_separateOrientation() { public void visitUris_separateOrientation() {
final RemoteViews landscape = new RemoteViews(mPackage, R.layout.remote_views_test); final RemoteViews landscape = new RemoteViews(mPackage, R.layout.remote_views_test);

1
services/tests/uiservicestests/src/com/android/server/notification/NotificationVisitUrisTest.java
View File

@@ -88,7 +88,6 @@ public class NotificationVisitUrisTest extends UiServiceTestCase {
private static final Multimap<Class<?>, String> KNOWN_BAD = private static final Multimap<Class<?>, String> KNOWN_BAD =
ImmutableMultimap.<Class<?>, String>builder() ImmutableMultimap.<Class<?>, String>builder()
.put(Notification.Builder.class, "setPublicVersion") // b/276294099 .put(Notification.Builder.class, "setPublicVersion") // b/276294099
.putAll(RemoteViews.class, "addView", "addStableView") // b/277740082
.put(RemoteViews.class, "setIcon") // b/281018094 .put(RemoteViews.class, "setIcon") // b/281018094
.put(Notification.WearableExtender.class, "addAction") // TODO: b/281044385 .put(Notification.WearableExtender.class, "addAction") // TODO: b/281044385
.put(Person.Builder.class, "setUri") // TODO: b/281044385 .put(Person.Builder.class, "setUri") // TODO: b/281044385