Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings

Browse Source 
-Update entry point at media indicator in volume panel
-Update entry point at remote media slice in volume panel
-Update entry point at remote volume group in Sound Settings
-Update entry point at media output preference in Sound Settings
-Hide Media output dialog when the caller is not active

Bug: 155822415
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib6c86067522925c439f336644e4d027dbae3379c
This commit is contained in:
timhypeng
2020-09-26 15:43:11 +08:00
parent 2489494cd3
commit 3084d063f3
7 changed files with 83 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/media/MediaOutputIndicatorSlice.java
View File

@@ -66,11 +66,11 @@ public class MediaOutputIndicatorSlice implements CustomSliceable {
final int requestCode = TextUtils.isEmpty(getWorker().getPackageName())
? 0
: getWorker().getPackageName().hashCode();
final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext,
requestCode,
getMediaOutputSliceIntent(), FLAG_UPDATE_CURRENT);
final PendingIntent primaryBroadcastIntent = PendingIntent.getBroadcast(mContext,
requestCode, getMediaOutputDialogIntent(), FLAG_UPDATE_CURRENT);
final SliceAction primarySliceAction = SliceAction.createDeeplink(
primaryActionIntent, icon, ListBuilder.ICON_IMAGE, title);
primaryBroadcastIntent, icon, ListBuilder.ICON_IMAGE, title);
@ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
// To set an empty icon to indent the row
final ListBuilder listBuilder = new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
@@ -84,12 +84,11 @@ public class MediaOutputIndicatorSlice implements CustomSliceable {
}
@VisibleForTesting
Intent getMediaOutputSliceIntent() {
Intent getMediaOutputDialogIntent() {
final MediaController mediaController = getWorker().getActiveLocalMediaController();
final Intent intent = new Intent()
.setPackage(Utils.SETTINGS_PACKAGE_NAME)
.setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
.setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME)
.setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG);
if (mediaController != null) {
intent.putExtra(MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN,
mediaController.getSessionToken());

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

@@ -133,8 +133,7 @@ public class RemoteMediaSlice implements CustomSliceable {
.setTitle(isMediaOutputDisabled ? spannableTitle : outputTitle)
.setSubtitle(info.getName())
.setTitleItem(emptyIcon, ListBuilder.ICON_IMAGE)
.setPrimaryAction(getMediaOutputSliceAction(
info.getClientPackageName(), isMediaOutputDisabled)));
.setPrimaryAction(getMediaOutputDialogAction(info, isMediaOutputDisabled)));
}
return listBuilder.build();
}
@@ -167,23 +166,23 @@ public class RemoteMediaSlice implements CustomSliceable {
return primarySliceAction;
}
private SliceAction getMediaOutputSliceAction(
String packageName, boolean isMediaOutputDisabled) {
private SliceAction getMediaOutputDialogAction(RoutingSessionInfo info,
boolean isMediaOutputDisabled) {
final Intent intent = new Intent()
.setAction(isMediaOutputDisabled
? ""
: MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME, packageName);
? "" : MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)
.setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME)
.putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,
info.getClientPackageName());
final IconCompat icon = IconCompat.createWithResource(mContext,
R.drawable.ic_volume_remote);
final int requestCode = TextUtils.isEmpty(packageName) ? 0 : packageName.hashCode();
final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext,
requestCode, intent, 0 /* flags */);
final PendingIntent primaryBroadcastIntent = PendingIntent.getBroadcast(mContext,
0 /* requestCode */, intent, 0 /* flags */);
final SliceAction primarySliceAction = SliceAction.createDeeplink(
primaryActionIntent, icon, ListBuilder.ICON_IMAGE,
primaryBroadcastIntent, icon, ListBuilder.ICON_IMAGE,
mContext.getString(R.string.media_output_label_title,
Utils.getApplicationLabel(mContext, packageName)));
Utils.getApplicationLabel(mContext, info.getClientPackageName())));
return primarySliceAction;
}