diff options
author | Wang, ArvinX <arvinx.wang@intel.com> | 2018-11-26 17:17:23 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-11-26 17:17:23 -0800 |
commit | e6ba72ace194034b0519ef9e22f067d77002cdea (patch) | |
tree | f10fc5bb49261f931e80d6c5fd6f104e70ccd2da | |
parent | 9278db2bcfa135aff468a376326cda746c552375 (diff) | |
parent | be6a7d46ae27295cbe360f9f43a0cab6c30ccdd4 (diff) | |
download | LensPicker-e6ba72ace194034b0519ef9e22f067d77002cdea.tar.gz |
Configure the LensResolverActivity intent with right music player am: 982d284d4f
am: be6a7d46ae
Change-Id: I62b5618ae241e3fa311e1786648f75898ead32e2
-rw-r--r-- | src/com/android/support/car/lenspicker/ResolverAdapter.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/com/android/support/car/lenspicker/ResolverAdapter.java b/src/com/android/support/car/lenspicker/ResolverAdapter.java index d9324c8..d85453b 100644 --- a/src/com/android/support/car/lenspicker/ResolverAdapter.java +++ b/src/com/android/support/car/lenspicker/ResolverAdapter.java @@ -18,7 +18,6 @@ package com.android.support.car.lenspicker; import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -91,7 +90,6 @@ public class ResolverAdapter extends RecyclerView.Adapter<ResolverListRow> List<LensPickerItem> items = new ArrayList<>(); PackageManager packageManager = mContext.getPackageManager(); - SharedPreferences sharedPref = LensPickerUtils.getFacetSharedPrefs(mContext); for (ResolveInfo info : mResolveInfos) { String packageName = LensPickerUtils.getPackageName(info); @@ -114,19 +112,21 @@ public class ResolverAdapter extends RecyclerView.Adapter<ResolverListRow> if (displayName.equals("")) { displayName = getComponentLabel(packageManager, aInfo); } - Intent launchIntent = LensPickerUtils.getLaunchIntent(packageName, info, - packageManager); - // If launchIntent is null, create an intent from the ResolverInfo - if (launchIntent == null) { - launchIntent = new Intent(); + + Intent intent; + if (LensPickerUtils.isMediaService(info)) { + intent = LensPickerUtils.getMediaLaunchIntent(packageManager, packageName, + info.serviceInfo.name); + } else { + intent = new Intent(); ActivityInfo activity = info.activityInfo; - launchIntent.setComponent( + intent.setComponent( new ComponentName(activity.applicationInfo.packageName, - activity.name)); + activity.name)); } items.add(new LensPickerItem(displayName, - getComponentIcon(packageManager, aInfo), launchIntent, + getComponentIcon(packageManager, aInfo), intent, null /* facetId */)); } catch (PackageManager.NameNotFoundException e) { // skip this package. |