From 729b5dd9fae069c1c34eff2d655620d6b7455c4e Mon Sep 17 00:00:00 2001
From: Andrey Epin <ayepin@google.com>
Date: Wed, 24 Apr 2024 14:49:33 -0700
Subject: Do not animate target icons and labels after payload selection
 change.

An shared icon cache is added to prevent icons reloading for the new
list adapter instance.

Bug: 325465291
Test: atest IntentResolver-tests-unit
Test: atest IntentResolver-tests-activity
Change-Id: Ifba9ec221dd6c52f4aff1d3ff94729b61c24981a
---
 .../src/com/android/intentresolver/ResolverWrapperActivity.java      | 5 +++--
 tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/activity/src/com/android/intentresolver/ResolverWrapperActivity.java b/tests/activity/src/com/android/intentresolver/ResolverWrapperActivity.java
index 30858c8e..b46d8bc3 100644
--- a/tests/activity/src/com/android/intentresolver/ResolverWrapperActivity.java
+++ b/tests/activity/src/com/android/intentresolver/ResolverWrapperActivity.java
@@ -171,11 +171,12 @@ public class ResolverWrapperActivity extends ResolverActivity {
         }
 
         @Override
-        public void loadAppTargetIcon(
+        @Nullable
+        public Drawable getOrLoadAppTargetIcon(
                 @NonNull DisplayResolveInfo info,
                 @NonNull UserHandle userHandle,
                 @NonNull Consumer<Drawable> callback) {
-            mTargetDataLoader.loadAppTargetIcon(info, userHandle, callback);
+            return mTargetDataLoader.getOrLoadAppTargetIcon(info, userHandle, callback);
         }
 
         @Override
diff --git a/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt b/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt
index bbe8a29e..5ac4f2b0 100644
--- a/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt
+++ b/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt
@@ -140,7 +140,7 @@ class ChooserListAdapterTest {
 
         testSubject.onBindView(view, targetInfo, 0)
 
-        verify(mTargetDataLoader, times(1)).loadAppTargetIcon(any(), any(), any())
+        verify(mTargetDataLoader, times(1)).getOrLoadAppTargetIcon(any(), any(), any())
     }
 
     @Test
-- 
cgit v1.2.3-59-g8ed1b