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

Implement visitUris for RemoteViews ViewGroupActionAdd. am: 850fd984e5 am: f479f5e1d7 am: b50f8cd595 am: d3525a9ddb am: 96154a4d36

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

Change-Id: I6d84dddefabc95225768db4b14453d28ed943b6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ioana Alexandru
2023-05-25 13:23:53 +00:00
committed by Automerger Merge Worker
parent 03196bf425 96154a4d36
commit fb2739848a
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2603,6 +2603,11 @@ public class RemoteViews implements Parcelable, Filter {
public int getActionTag() {
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

@@ -719,6 +719,30 @@ public class RemoteViewsTest {
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
public void visitUris_separateOrientation() {
final RemoteViews landscape = new RemoteViews(mPackage, R.layout.remote_views_test);