commit 9c9761b88680e0715a092078f8b025dd5158f185
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 28 19:09:38 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 28 19:09:38 2022 +0000
tree 1ce8555fe110b4ec02130d7effd621489c7a9c72
parent c5f0f63f819182002031b9e714f10a5379ab6ae5
parent 545cc43ff221b1bf288e0e61dae481624d6f1c3a

Merge "ListViewTest: allow custom backgrounds in list items" into android10-tests-dev

tests/tests/widget/src/android/widget/cts/ListViewTest.java

diff --git a/tests/tests/widget/src/android/widget/cts/ListViewTest.java b/tests/tests/widget/src/android/widget/cts/ListViewTest.java
index 548bce6..661df06 100644
--- a/tests/tests/widget/src/android/widget/cts/ListViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ListViewTest.java
@@ -1000,8 +1000,12 @@
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             final View view = super.getView(position, convertView, parent);
-            if (view.getBackground() == null) {
-                view.setBackground(spy(new ColorDrawable(Color.BLACK)));
+            if (convertView == null) {
+                if (view.getBackground() == null) {
+                    view.setBackground(spy(new ColorDrawable(Color.BLACK)));
+                } else {
+                    view.setBackground(spy(view.getBackground()));
+                }
             }
             return view;
         }