Make 'ShortcutSelectionLogic' Injectable.

This adds a module to provide the shortcut per-app limit
and the existing DeviceConfig flag used to control whether
that limit is applied.

Once fully integrated, tests should be updated to simply
increase the limit by injecting a different value, instead
of altering the device state by modfying DeviceConfig
values.

To complete, inject into the caller of  ChooserListAdapter.addServiceResults,
moving usage injecting this component to the caller to use.

Bug: 300157408
Test: (this change does not yet affect live code)
Flag: n/a
Change-Id: I63a661ca304c8d5653992761f10983b5776d50dd

2 files changed, 95 insertions, 5 deletions

diff --git a/java/src/com/android/intentresolver/ShortcutSelectionLogic.java b/java/src/com/android/intentresolver/ShortcutSelectionLogic.java
index efaaf894..12465184 100644
--- a/java/src/com/android/intentresolver/ShortcutSelectionLogic.java
+++ b/java/src/com/android/intentresolver/ShortcutSelectionLogic.java
@@ -30,13 +30,19 @@ import androidx.annotation.Nullable;
 import com.android.intentresolver.chooser.DisplayResolveInfo;
 import com.android.intentresolver.chooser.SelectableTargetInfo;
 import com.android.intentresolver.chooser.TargetInfo;
+import com.android.intentresolver.v2.ui.AppShortcutLimit;
+import com.android.intentresolver.v2.ui.EnforceShortcutLimit;
 
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
-class ShortcutSelectionLogic {
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class ShortcutSelectionLogic {
     private static final String TAG = "ShortcutSelectionLogic";
     private static final boolean DEBUG = false;
     private static final float PINNED_SHORTCUT_TARGET_SCORE_BOOST = 1000.f;
@@ -49,9 +55,10 @@ class ShortcutSelectionLogic {
     private final Comparator<ChooserTarget> mBaseTargetComparator =
             (lhs, rhs) -> Float.compare(rhs.getScore(), lhs.getScore());
 
-    ShortcutSelectionLogic(
-            int maxShortcutTargetsPerApp,
-            boolean applySharingAppLimits) {
+    @Inject
+    public ShortcutSelectionLogic(
+            @AppShortcutLimit int maxShortcutTargetsPerApp,
+            @EnforceShortcutLimit boolean applySharingAppLimits) {
         mMaxShortcutTargetsPerApp = maxShortcutTargetsPerApp;
         mApplySharingAppLimits = applySharingAppLimits;
     }
@@ -78,7 +85,7 @@ class ShortcutSelectionLogic {
                     + targets.size()
                     + " targets");
         }
-        if (targets.size() == 0) {
+        if (targets.isEmpty()) {
             return false;
         }
         Collections.sort(targets, mBaseTargetComparator);
diff --git a/java/src/com/android/intentresolver/v2/ui/ShortcutPolicyModule.kt b/java/src/com/android/intentresolver/v2/ui/ShortcutPolicyModule.kt
new file mode 100644
index 00000000..9ed5f9dd
--- /dev/null
+++ b/java/src/com/android/intentresolver/v2/ui/ShortcutPolicyModule.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.intentresolver.v2.ui
+
+import android.content.res.Resources
+import android.provider.DeviceConfig
+import com.android.intentresolver.R
+import com.android.intentresolver.inject.ApplicationOwned
+import com.android.internal.config.sysui.SystemUiDeviceConfigFlags
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Qualifier
+import javax.inject.Singleton
+
+@Qualifier
+@MustBeDocumented @Retention(AnnotationRetention.RUNTIME) annotation class AppShortcutLimit
+@Qualifier
+@MustBeDocumented @Retention(AnnotationRetention.RUNTIME) annotation class EnforceShortcutLimit
+@Qualifier
+@MustBeDocumented @Retention(AnnotationRetention.RUNTIME) annotation class ShortcutRowLimit
+
+@Module
+@InstallIn(SingletonComponent::class)
+object ShortcutPolicyModule {
+    /**
+     * Defines the limit for the number of shortcut targets provided for any single app.
+     *
+     * This value applies to both results from Shortcut-service and app-provided targets on
+     * a per-package basis.
+     */
+    @Provides
+    @Singleton
+    @AppShortcutLimit
+    fun appShortcutLimit(@ApplicationOwned resources: Resources): Int {
+        return resources.getInteger(R.integer.config_maxShortcutTargetsPerApp)
+    }
+
+    /**
+     * Once this value is no longer necessary it should be replaced in tests with simply replacing
+     * [AppShortcutLimit]:
+     * ```
+     *    @BindValue
+     *    @AppShortcutLimit
+     *    var shortcutLimit = Int.MAX_VALUE
+     * ```
+     */
+    @Provides
+    @Singleton
+    @EnforceShortcutLimit
+    fun applyShortcutLimit(): Boolean {
+        return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,
+            SystemUiDeviceConfigFlags.APPLY_SHARING_APP_LIMITS_IN_SYSUI, true)
+    }
+
+    /**
+     * Defines the limit for the number of shortcuts presented within the direct share row.
+     *
+     * This value applies to all displayed direct share targets, including those from Shortcut
+     * service as well as app-provided targets.
+     */
+    @Provides
+    @Singleton
+    @ShortcutRowLimit
+    fun shortcutRowLimit(@ApplicationOwned resources: Resources): Int {
+        return resources.getInteger(R.integer.config_chooser_max_targets_per_row)
+    }
+}
\ No newline at end of file