From 34f3b5d5992bf07674abb007a76f2b469e4e6ad8 Mon Sep 17 00:00:00 2001
From: Andrey Yepin <ayepin@google.com>
Date: Tue, 5 Nov 2024 15:11:35 -0800
Subject: Reload targets by recreating adapters in response to target pinning.

Use Shareousel's target list updating logic in response to target pinning
and application changed broadcasts. Create new adapters and attach them
to the views after data is loaded, resulting in a cleaner visual update.

Fix: 230703572
Test: manual testing
Test: atest IntentResolver-tests-unit
Flag: com.android.intentresolver.rebuild_adapters_on_target_pinning
Change-Id: I1e7e2fd820195134ec4940f2e76bf7b3eac9e086
---
 java/src/com/android/intentresolver/ChooserActivity.java    | 11 ++++++++---
 .../com/android/intentresolver/ShortcutSelectionLogic.java  | 13 ++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'java/src/com')

diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index 250edaf2..f7cc9291 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -25,6 +25,7 @@ import static androidx.lifecycle.LifecycleKt.getCoroutineScope;
 import static com.android.intentresolver.ChooserActionFactory.EDIT_SOURCE;
 import static com.android.intentresolver.Flags.fixShortcutsFlashing;
 import static com.android.intentresolver.Flags.keyboardNavigationFix;
+import static com.android.intentresolver.Flags.rebuildAdaptersOnTargetPinning;
 import static com.android.intentresolver.Flags.shareouselUpdateExcludeComponentsExtra;
 import static com.android.intentresolver.Flags.unselectFinalItem;
 import static com.android.intentresolver.ext.CreationExtrasExtKt.replaceDefaultArgs;
@@ -1545,10 +1546,14 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
     private void handlePackagesChanged(@Nullable ResolverListAdapter listAdapter) {
         // Refresh pinned items
         mPinnedSharedPrefs = getPinnedSharedPrefs(this);
-        if (listAdapter == null) {
-            mChooserMultiProfilePagerAdapter.refreshPackagesInAllTabs();
+        if (rebuildAdaptersOnTargetPinning()) {
+            recreatePagerAdapter();
         } else {
-            listAdapter.handlePackagesChanged();
+            if (listAdapter == null) {
+                mChooserMultiProfilePagerAdapter.refreshPackagesInAllTabs();
+            } else {
+                listAdapter.handlePackagesChanged();
+            }
         }
     }
 
diff --git a/java/src/com/android/intentresolver/ShortcutSelectionLogic.java b/java/src/com/android/intentresolver/ShortcutSelectionLogic.java
index 2d5ec451..3a1a51e3 100644
--- a/java/src/com/android/intentresolver/ShortcutSelectionLogic.java
+++ b/java/src/com/android/intentresolver/ShortcutSelectionLogic.java
@@ -16,6 +16,8 @@
 
 package com.android.intentresolver;
 
+import static com.android.intentresolver.Flags.rebuildAdaptersOnTargetPinning;
+
 import android.app.prediction.AppTarget;
 import android.content.Context;
 import android.content.Intent;
@@ -171,16 +173,21 @@ public class ShortcutSelectionLogic {
             List<TargetInfo> serviceTargets) {
 
         // Check for duplicates and abort if found
-        for (TargetInfo otherTargetInfo : serviceTargets) {
+        for (int i = 0; i < serviceTargets.size(); i++) {
+            TargetInfo otherTargetInfo = serviceTargets.get(i);
             if (chooserTargetInfo.isSimilar(otherTargetInfo)) {
+                if (rebuildAdaptersOnTargetPinning()
+                        && chooserTargetInfo.isPinned() != otherTargetInfo.isPinned()) {
+                    serviceTargets.set(i, chooserTargetInfo);
+                    return true;
+                }
                 return false;
             }
         }
 
         int currentSize = serviceTargets.size();
         final float newScore = chooserTargetInfo.getModifiedScore();
-        for (int i = 0; i < Math.min(currentSize, maxRankedTargets);
-                i++) {
+        for (int i = 0; i < Math.min(currentSize, maxRankedTargets); i++) {
             final TargetInfo serviceTarget = serviceTargets.get(i);
             if (serviceTarget == null) {
                 serviceTargets.set(i, chooserTargetInfo);
-- 
cgit v1.2.3-59-g8ed1b