From 80b14ff184f577e24879bc1d867c5f1581838854 Mon Sep 17 00:00:00 2001 From: timhypeng Date: Tue, 22 Dec 2020 21:13:40 +0800 Subject: [PATCH 1/2] Rename MediaOutputSliceConstants to MediaOutputConstants -Rename it to a generic file name Bug: 165772904 Test: build pass Change-Id: I791d3d6a2dbd7caba04c08409d45aead89ac8c85 --- ...MediaOutputSliceConstants.java => MediaOutputConstants.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename packages/SettingsLib/src/com/android/settingslib/media/{MediaOutputSliceConstants.java => MediaOutputConstants.java} (98%) diff --git a/packages/SettingsLib/src/com/android/settingslib/media/MediaOutputSliceConstants.java b/packages/SettingsLib/src/com/android/settingslib/media/MediaOutputConstants.java similarity index 98% rename from packages/SettingsLib/src/com/android/settingslib/media/MediaOutputSliceConstants.java rename to packages/SettingsLib/src/com/android/settingslib/media/MediaOutputConstants.java index 61af5a74b00a7..647fd2acf7c87 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/MediaOutputSliceConstants.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/MediaOutputConstants.java @@ -19,7 +19,7 @@ package com.android.settingslib.media; /** * Class to access MediaOutput constants. */ -public class MediaOutputSliceConstants { +public class MediaOutputConstants { /** * Key for the Remote Media slice. From ded7fa7616e7e2eed60e9781717ef45d957bad70 Mon Sep 17 00:00:00 2001 From: timhypeng Date: Tue, 22 Dec 2020 21:14:23 +0800 Subject: [PATCH 2/2] Rename MediaOutputSliceConstants to MediaOutputConstants -Slice is not used and it is better to remove the slice string Bug: 165772904 Test: build pass Change-Id: Ib9346d62c9938dcafaa1429242d8f211da5b47f8 --- .../systemui/media/dialog/MediaOutputController.java | 6 +++--- .../systemui/media/dialog/MediaOutputDialogReceiver.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java index 4f8519289a078..5dd2f065cd4fd 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java @@ -46,7 +46,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.media.InfoMediaManager; import com.android.settingslib.media.LocalMediaManager; import com.android.settingslib.media.MediaDevice; -import com.android.settingslib.media.MediaOutputSliceConstants; +import com.android.settingslib.media.MediaOutputConstants; import com.android.settingslib.utils.ThreadUtils; import com.android.systemui.R; import com.android.systemui.plugins.ActivityStarter; @@ -449,8 +449,8 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { mCallback.dismissDialog(); final ActivityStarter.OnDismissAction postKeyguardAction = () -> { mContext.sendBroadcast(new Intent() - .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_BLUETOOTH_PAIRING) - .setPackage(MediaOutputSliceConstants.SETTINGS_PACKAGE_NAME)); + .setAction(MediaOutputConstants.ACTION_LAUNCH_BLUETOOTH_PAIRING) + .setPackage(MediaOutputConstants.SETTINGS_PACKAGE_NAME)); mShadeController.animateCollapsePanels(); return true; }; diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogReceiver.kt b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogReceiver.kt index 0ce0c020ccde3..bd3f5a6d82a5b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogReceiver.kt +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogReceiver.kt @@ -20,7 +20,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.text.TextUtils -import com.android.settingslib.media.MediaOutputSliceConstants +import com.android.settingslib.media.MediaOutputConstants import javax.inject.Inject /** @@ -30,10 +30,10 @@ class MediaOutputDialogReceiver @Inject constructor( private val mediaOutputDialogFactory: MediaOutputDialogFactory ) : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { - if (TextUtils.equals(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG, + if (TextUtils.equals(MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG, intent.action)) { mediaOutputDialogFactory.create( - intent.getStringExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME), false) + intent.getStringExtra(MediaOutputConstants.EXTRA_PACKAGE_NAME), false) } } }