release-request-c95412f1-5f1e-4c57-a922-faa9b288e2d0-for-git_oc-mr1-release-4229613 snap-temp-L11600000087367977
Change-Id: Id9d9ff82130c99eb50aa6f010c2882914107b5be
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;
}
diff --git a/src/com/android/support/car/lenspicker/LensPickerAdapter.java b/src/com/android/support/car/lenspicker/LensPickerAdapter.java
index b3e44cc..b982dca 100644
--- a/src/com/android/support/car/lenspicker/LensPickerAdapter.java
+++ b/src/com/android/support/car/lenspicker/LensPickerAdapter.java
@@ -45,7 +45,6 @@
private final Context mContext;
private final LensPickerSelectionHandler mSelectionHandler;
private final List<LensPickerItem> mItems = new ArrayList<>();
- private int mMaxItems;
private LoadTask mLoader;
private PackageManager mPackageManager;
@@ -79,12 +78,12 @@
@Override
public int getItemCount() {
- return Math.min(mItems.size(), mMaxItems);
+ return mItems.size();
}
@Override
public void setMaxItems(int maxItems) {
- mMaxItems = maxItems;
+ // Ignore maxItems
}
private class LoadTask extends AsyncTask<Void, Void, Void> {
