diff --git a/src/com/android/settings/media/BluetoothPairingReceiver.java b/src/com/android/settings/media/BluetoothPairingReceiver.java index 5b578003941..1ec99b00598 100644 --- a/src/com/android/settings/media/BluetoothPairingReceiver.java +++ b/src/com/android/settings/media/BluetoothPairingReceiver.java @@ -25,7 +25,7 @@ import android.text.TextUtils; import com.android.settings.R; import com.android.settings.bluetooth.BluetoothPairingDetail; import com.android.settings.core.SubSettingLauncher; -import com.android.settingslib.media.MediaOutputSliceConstants; +import com.android.settingslib.media.MediaOutputConstants; /** * BroadcastReceiver for handling media output intent @@ -33,7 +33,7 @@ import com.android.settingslib.media.MediaOutputSliceConstants; public class BluetoothPairingReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - if (TextUtils.equals(MediaOutputSliceConstants.ACTION_LAUNCH_BLUETOOTH_PAIRING, + if (TextUtils.equals(MediaOutputConstants.ACTION_LAUNCH_BLUETOOTH_PAIRING, intent.getAction())) { context.startActivity(new SubSettingLauncher(context) .setDestination(BluetoothPairingDetail.class.getName()) diff --git a/src/com/android/settings/media/MediaOutputIndicatorSlice.java b/src/com/android/settings/media/MediaOutputIndicatorSlice.java index 69e5dde4dbe..10a8b792d56 100644 --- a/src/com/android/settings/media/MediaOutputIndicatorSlice.java +++ b/src/com/android/settings/media/MediaOutputIndicatorSlice.java @@ -36,7 +36,7 @@ import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.slices.CustomSliceable; import com.android.settings.slices.SliceBackgroundWorker; -import com.android.settingslib.media.MediaOutputSliceConstants; +import com.android.settingslib.media.MediaOutputConstants; public class MediaOutputIndicatorSlice implements CustomSliceable { @@ -128,15 +128,15 @@ public class MediaOutputIndicatorSlice implements CustomSliceable { } // Launch media output dialog mContext.sendBroadcast(new Intent() - .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME) - .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG) - .putExtra(MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN, + .setPackage(MediaOutputConstants.SYSTEMUI_PACKAGE_NAME) + .setAction(MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG) + .putExtra(MediaOutputConstants.KEY_MEDIA_SESSION_TOKEN, mediaController.getSessionToken()) - .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME, + .putExtra(MediaOutputConstants.EXTRA_PACKAGE_NAME, mediaController.getPackageName())); // Dismiss volume panel mContext.sendBroadcast(new Intent() - .setPackage(MediaOutputSliceConstants.SETTINGS_PACKAGE_NAME) - .setAction(MediaOutputSliceConstants.ACTION_CLOSE_PANEL)); + .setPackage(MediaOutputConstants.SETTINGS_PACKAGE_NAME) + .setAction(MediaOutputConstants.ACTION_CLOSE_PANEL)); } } diff --git a/src/com/android/settings/media/RemoteMediaSlice.java b/src/com/android/settings/media/RemoteMediaSlice.java index 839dc4f1bfd..e69c0050145 100644 --- a/src/com/android/settings/media/RemoteMediaSlice.java +++ b/src/com/android/settings/media/RemoteMediaSlice.java @@ -48,7 +48,7 @@ import com.android.settings.slices.CustomSliceable; import com.android.settings.slices.SliceBackgroundWorker; import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settings.slices.SliceBuilderUtils; -import com.android.settingslib.media.MediaOutputSliceConstants; +import com.android.settingslib.media.MediaOutputConstants; import java.util.List; @@ -86,14 +86,14 @@ public class RemoteMediaSlice implements CustomSliceable { // Launch Media Output Dialog final RoutingSessionInfo info = intent.getParcelableExtra(SESSION_INFO); mContext.sendBroadcast(new Intent() - .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME) - .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG) - .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME, + .setPackage(MediaOutputConstants.SYSTEMUI_PACKAGE_NAME) + .setAction(MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG) + .putExtra(MediaOutputConstants.EXTRA_PACKAGE_NAME, info.getClientPackageName())); // Dismiss volume panel mContext.sendBroadcast(new Intent() - .setPackage(MediaOutputSliceConstants.SETTINGS_PACKAGE_NAME) - .setAction(MediaOutputSliceConstants.ACTION_CLOSE_PANEL)); + .setPackage(MediaOutputConstants.SETTINGS_PACKAGE_NAME) + .setAction(MediaOutputConstants.ACTION_CLOSE_PANEL)); } } diff --git a/src/com/android/settings/notification/RemoteVolumeGroupController.java b/src/com/android/settings/notification/RemoteVolumeGroupController.java index eaff9e1c250..dd6f5160122 100644 --- a/src/com/android/settings/notification/RemoteVolumeGroupController.java +++ b/src/com/android/settings/notification/RemoteVolumeGroupController.java @@ -34,7 +34,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnDestroy; 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 java.util.ArrayList; @@ -196,9 +196,9 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem if (TextUtils.equals(info.getId(), preference.getKey().substring(SWITCHER_PREFIX.length()))) { final Intent intent = new Intent() - .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG) - .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME) - .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME, + .setAction(MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG) + .setPackage(MediaOutputConstants.SYSTEMUI_PACKAGE_NAME) + .putExtra(MediaOutputConstants.EXTRA_PACKAGE_NAME, info.getClientPackageName()); mContext.sendBroadcast(intent); return true; diff --git a/src/com/android/settings/panel/SettingsPanelActivity.java b/src/com/android/settings/panel/SettingsPanelActivity.java index b7b15192354..856dc35c6ec 100644 --- a/src/com/android/settings/panel/SettingsPanelActivity.java +++ b/src/com/android/settings/panel/SettingsPanelActivity.java @@ -16,7 +16,7 @@ package com.android.settings.panel; -import static com.android.settingslib.media.MediaOutputSliceConstants.EXTRA_PACKAGE_NAME; +import static com.android.settingslib.media.MediaOutputConstants.EXTRA_PACKAGE_NAME; import android.content.Intent; import android.content.res.Configuration; diff --git a/src/com/android/settings/panel/VolumePanel.java b/src/com/android/settings/panel/VolumePanel.java index b5e807d8fa7..3e6d1ce958d 100644 --- a/src/com/android/settings/panel/VolumePanel.java +++ b/src/com/android/settings/panel/VolumePanel.java @@ -38,7 +38,7 @@ import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; import com.android.settings.R; -import com.android.settingslib.media.MediaOutputSliceConstants; +import com.android.settingslib.media.MediaOutputConstants; import java.util.ArrayList; import java.util.List; @@ -55,7 +55,7 @@ public class VolumePanel implements PanelContent, LifecycleObserver { private final BroadcastReceiver mReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - if (MediaOutputSliceConstants.ACTION_CLOSE_PANEL.equals(intent.getAction())) { + if (MediaOutputConstants.ACTION_CLOSE_PANEL.equals(intent.getAction())) { mCallback.forceClose(); } } @@ -73,7 +73,7 @@ public class VolumePanel implements PanelContent, LifecycleObserver { @OnLifecycleEvent(ON_RESUME) public void onResume() { final IntentFilter filter = new IntentFilter(); - filter.addAction(MediaOutputSliceConstants.ACTION_CLOSE_PANEL); + filter.addAction(MediaOutputConstants.ACTION_CLOSE_PANEL); mContext.registerReceiver(mReceiver, filter); } diff --git a/src/com/android/settings/slices/CustomSliceRegistry.java b/src/com/android/settings/slices/CustomSliceRegistry.java index be71b308a44..e40b164e966 100644 --- a/src/com/android/settings/slices/CustomSliceRegistry.java +++ b/src/com/android/settings/slices/CustomSliceRegistry.java @@ -46,7 +46,7 @@ import com.android.settings.notification.zen.ZenModeButtonPreferenceController; import com.android.settings.wifi.calling.WifiCallingSliceHelper; import com.android.settings.wifi.slice.ContextualWifiSlice; import com.android.settings.wifi.slice.WifiSlice; -import com.android.settingslib.media.MediaOutputSliceConstants; +import com.android.settingslib.media.MediaOutputConstants; import java.util.Map; @@ -293,7 +293,7 @@ public class CustomSliceRegistry { .scheme(ContentResolver.SCHEME_CONTENT) .authority(SettingsSliceProvider.SLICE_AUTHORITY) .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION) - .appendPath(MediaOutputSliceConstants.KEY_REMOTE_MEDIA) + .appendPath(MediaOutputConstants.KEY_REMOTE_MEDIA) .build(); /** diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java index b5562a3a5c8..4ec00e358a9 100644 --- a/src/com/android/settings/sound/MediaOutputPreferenceController.java +++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java @@ -32,7 +32,7 @@ import com.android.settings.media.MediaOutputUtils; import com.android.settingslib.Utils; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.HearingAidProfile; -import com.android.settingslib.media.MediaOutputSliceConstants; +import com.android.settingslib.media.MediaOutputConstants; import java.util.List; @@ -134,11 +134,11 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro public boolean handlePreferenceTreeClick(Preference preference) { if (TextUtils.equals(preference.getKey(), getPreferenceKey())) { mContext.sendBroadcast(new Intent() - .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG) - .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME) - .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME, + .setAction(MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG) + .setPackage(MediaOutputConstants.SYSTEMUI_PACKAGE_NAME) + .putExtra(MediaOutputConstants.EXTRA_PACKAGE_NAME, mMediaController.getPackageName()) - .putExtra(MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN, + .putExtra(MediaOutputConstants.KEY_MEDIA_SESSION_TOKEN, mMediaController.getSessionToken())); return true; } diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java index 68848af3ab9..7248ff65199 100644 --- a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java +++ b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java @@ -51,7 +51,7 @@ import com.android.settings.slices.SliceBackgroundWorker; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.media.MediaDevice; -import com.android.settingslib.media.MediaOutputSliceConstants; +import com.android.settingslib.media.MediaOutputConstants; import org.junit.Before; import org.junit.Test; @@ -219,13 +219,13 @@ public class MediaOutputIndicatorSliceTest { Intent intent = intentList.get(0); assertThat(TextUtils.equals(TEST_PACKAGE_NAME, intent.getStringExtra( - MediaOutputSliceConstants.EXTRA_PACKAGE_NAME))).isTrue(); - assertThat(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG).isEqualTo( + MediaOutputConstants.EXTRA_PACKAGE_NAME))).isTrue(); + assertThat(MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG).isEqualTo( intent.getAction()); - assertThat(TextUtils.equals(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME, + assertThat(TextUtils.equals(MediaOutputConstants.SYSTEMUI_PACKAGE_NAME, intent.getPackage())).isTrue(); assertThat(mToken == intent.getExtras().getParcelable( - MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN)).isTrue(); + MediaOutputConstants.KEY_MEDIA_SESSION_TOKEN)).isTrue(); } @Test @@ -240,13 +240,13 @@ public class MediaOutputIndicatorSliceTest { Intent intent = intentList.get(0); assertThat(TextUtils.isEmpty(intent.getStringExtra( - MediaOutputSliceConstants.EXTRA_PACKAGE_NAME))).isTrue(); - assertThat(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG).isEqualTo( + MediaOutputConstants.EXTRA_PACKAGE_NAME))).isTrue(); + assertThat(MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG).isEqualTo( intent.getAction()); - assertThat(TextUtils.equals(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME, + assertThat(TextUtils.equals(MediaOutputConstants.SYSTEMUI_PACKAGE_NAME, intent.getPackage())).isTrue(); assertThat(intent.getExtras().getParcelable( - MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN) == null).isTrue(); + MediaOutputConstants.KEY_MEDIA_SESSION_TOKEN) == null).isTrue(); } @Test diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java index eb84a4fb3fb..f604193debc 100644 --- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java @@ -58,7 +58,7 @@ import com.android.settingslib.bluetooth.BluetoothEventManager; import com.android.settingslib.bluetooth.HearingAidProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; -import com.android.settingslib.media.MediaOutputSliceConstants; +import com.android.settingslib.media.MediaOutputConstants; import org.junit.After; import org.junit.Before; @@ -302,7 +302,7 @@ public class MediaOutputPreferenceControllerTest { mController.handlePreferenceTreeClick(mPreference); verify(mContext).sendBroadcast(intentCaptor.capture()); assertThat(intentCaptor.getValue().getAction()) - .isEqualTo(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG); + .isEqualTo(MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG); } /**