Bug 880230 - Use num of unique services shared with to determine how many quick share icons to show. r=lucasr

mobile/android/base/widget/ActivityChooserModel.java

@@ -668,6 +668,20 @@ public class ActivityChooserModel extends DataSetObservable {
         }
     }
 
+    public int getDistinctActivityCountInHistory() {
+        synchronized (mInstanceLock) {
+            ensureConsistentState();
+            final List<String> packages = new ArrayList<String>();
+            for (HistoricalRecord record : mHistoricalRecords) {
+              String activity = record.activity.flattenToString();
+              if (!packages.contains(activity)) {
+                packages.add(activity);
+              }
+            }
+            return packages.size();
+        }
+    }
+
     @Override
     protected void finalize() throws Throwable {
         super.finalize();

mobile/android/base/widget/GeckoActionProvider.java

@@ -54,7 +54,7 @@ public class GeckoActionProvider extends ActionProvider {
         view.setActionButtonClickListener(mCallbacks);
 
         final PackageManager packageManager = mContext.getPackageManager();
-        int historySize = dataModel.getHistorySize();
+        int historySize = dataModel.getDistinctActivityCountInHistory();
         if (historySize > 2) {
             historySize = 2;
         }
@@ -142,4 +142,3 @@ public class GeckoActionProvider extends ActionProvider {
         }
     }
 }
-