PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c

Browse Source 
Change-Id: Ie52a859080d88cf517ed92615a52be9b4086087e
This commit is contained in:
Automerger Merge Worker
2020-03-05 05:58:56 +00:00
parent 60bc99d812 5578920e4c
commit 3cd1238aff
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/media/RemoteMediaSlice.java
View File

@@ -112,7 +112,8 @@ public class RemoteMediaSlice implements CustomSliceable {
.setTitle(outputTitle) .setTitle(outputTitle)
.setSubtitle(mediaDevice.getName()) .setSubtitle(mediaDevice.getName())
.setTitleItem(emptyIcon, ListBuilder.ICON_IMAGE) .setTitleItem(emptyIcon, ListBuilder.ICON_IMAGE)
.setPrimaryAction(getMediaOutputSliceAction())); .setPrimaryAction(getMediaOutputSliceAction(
mediaDevice.getClientPackageName())));
} }
return listBuilder.build(); return listBuilder.build();
} }
@@ -144,10 +145,11 @@ public class RemoteMediaSlice implements CustomSliceable {
return primarySliceAction; return primarySliceAction;
} }
private SliceAction getMediaOutputSliceAction() { private SliceAction getMediaOutputSliceAction(String packageName) {
final Intent intent = new Intent() final Intent intent = new Intent()
.setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT) .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME, packageName);
final IconCompat icon = IconCompat.createWithResource(mContext, final IconCompat icon = IconCompat.createWithResource(mContext,
R.drawable.ic_volume_remote); R.drawable.ic_volume_remote);
final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext, final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext,