commit 810f047d36010d7e2715fb7fcc8891e6e802ad87
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 27 22:41:08 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 27 22:41:08 2017 +0000
tree c4c317726ecdff16d5039bb7701c4f652fa05cb0
parent c899a0564fe4656863be4022223dab2b9e211c72
parent d7303de982d8e9ef43f3562b3da7c3e0a38d9324

Merge "Remove max item restriction on facet list." into oc-mr1-dev

src/com/android/support/car/lenspicker/LensPickerActivity.java

diff --git a/src/com/android/support/car/lenspicker/LensPickerActivity.java b/src/com/android/support/car/lenspicker/LensPickerActivity.java
index d47ae28..19194f9 100644
--- a/src/com/android/support/car/lenspicker/LensPickerActivity.java
+++ b/src/com/android/support/car/lenspicker/LensPickerActivity.java
@@ -20,6 +20,7 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.content.pm.ResolveInfo.DisplayNameComparator;
 import android.os.Bundle;
 import android.service.media.MediaBrowserService;
 import android.text.TextUtils;
@@ -29,6 +30,7 @@
 import com.android.car.view.PagedListView;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -160,6 +162,12 @@
             printResolveInfo("after dedupe", filteredPackageList);
         }
 
+        // If presenting a category, alphabetize the list based on name.
+        if (categories != null) {
+            Collections.sort(filteredPackageList, new DisplayNameComparator(mPackageManager));
+        }
+
+
         return filteredPackageList;
     }