commit 86b970553573971ba35d288aece1e48709d0721d
author Mario Bertschler <bmario@google.com> Fri May 05 20:01:33 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 05 20:01:35 2017 +0000
tree 682d52e011ea97bbe9ec0d0c91ac7f1f793e14a5
parent f7d9b70700cd85b3de567d59a55f7c3354bdafb0
parent c0372a42a256421199e5d41592b69a6f4c2e9ef1

Merge "Adding suggested app as part of app discovery." into ub-launcher3-dorval-polish

src/com/android/launcher3/allapps/AlphabeticalAppsList.java

diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index f291a80..7963719 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -183,7 +183,10 @@
     private final List<ComponentKey> mPredictedAppComponents = new ArrayList<>();
     // The set of predicted apps resolved from the component names and the current set of apps
     private final List<AppInfo> mPredictedApps = new ArrayList<>();
+    // The set of apps returned from a discovery service while searching
     private final List<AppDiscoveryAppInfo> mDiscoveredApps = new ArrayList<>();
+    // The suggested app returned by a discovery service
+    private AppDiscoveryAppInfo mSuggestedApp;
 
     // The of ordered component names as a result of a search query
     private ArrayList<ComponentKey> mSearchResults;
@@ -288,6 +291,9 @@
                 @NonNull AppDiscoveryUpdateState state) {
         mAppDiscoveryUpdateState = state;
         switch (state) {
+            case SUGGESTED:
+                mSuggestedApp = app != null ? new AppDiscoveryAppInfo(app) : null;
+                break;
             case START:
                 mDiscoveredApps.clear();
                 break;
@@ -435,6 +441,7 @@
         // Process the predicted app components
         mPredictedApps.clear();
         if (mPredictedAppComponents != null && !mPredictedAppComponents.isEmpty() && !hasFilter()) {
+            int suggestedAppsCount = mSuggestedApp != null ? 1 : 0;
             for (ComponentKey ck : mPredictedAppComponents) {
                 AppInfo info = mComponentToAppMap.get(ck);
                 if (info != null) {
@@ -445,11 +452,16 @@
                     }
                 }
                 // Stop at the number of predicted apps
-                if (mPredictedApps.size() == mNumPredictedAppsPerRow) {
+                if (mPredictedApps.size() + suggestedAppsCount == mNumPredictedAppsPerRow) {
                     break;
                 }
             }
 
+            if (mSuggestedApp != null) {
+                // adding suggested app as the last predicted app
+                mPredictedApps.add(mSuggestedApp);
+            }
+
             if (!mPredictedApps.isEmpty()) {
                 // Add a section for the predictions
                 lastFastScrollerSectionInfo = new FastScrollSectionInfo("");

src/com/android/launcher3/discovery/AppDiscoveryUpdateState.java

diff --git a/src/com/android/launcher3/discovery/AppDiscoveryUpdateState.java b/src/com/android/launcher3/discovery/AppDiscoveryUpdateState.java
index 0700a10..6c68044 100644
--- a/src/com/android/launcher3/discovery/AppDiscoveryUpdateState.java
+++ b/src/com/android/launcher3/discovery/AppDiscoveryUpdateState.java
@@ -17,5 +17,5 @@
 package com.android.launcher3.discovery;
 
 public enum AppDiscoveryUpdateState {
-    START, UPDATE, END
+    START, UPDATE, END, SUGGESTED
 }