diff --git a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java index 6b9866bf05e0a..071ab27f60b96 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java @@ -33,7 +33,6 @@ import static android.media.MediaRoute2Info.TYPE_WIRED_HEADSET; import static android.media.RouteListingPreference.Item.FLAG_ONGOING_SESSION; import static android.media.RouteListingPreference.Item.FLAG_ONGOING_SESSION_MANAGED; import static android.media.RouteListingPreference.Item.FLAG_SUGGESTED; -import static android.media.RouteListingPreference.Item.SELECTION_BEHAVIOR_TRANSFER; import static android.media.RouteListingPreference.Item.SUBTEXT_AD_ROUTING_DISALLOWED; import static android.media.RouteListingPreference.Item.SUBTEXT_CUSTOM; import static android.media.RouteListingPreference.Item.SUBTEXT_DEVICE_LOW_POWER; @@ -45,6 +44,7 @@ import static android.media.RouteListingPreference.Item.SUBTEXT_TRACK_UNSUPPORTE import static android.media.RouteListingPreference.Item.SUBTEXT_UNAUTHORIZED; import static com.android.settingslib.media.LocalMediaManager.MediaDeviceState.STATE_SELECTED; +import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_TRANSFER; import android.annotation.SuppressLint; import android.content.Context; @@ -95,6 +95,17 @@ public abstract class MediaDevice implements Comparable { int TYPE_CAST_GROUP_DEVICE = 7; } + @Retention(RetentionPolicy.SOURCE) + @IntDef({SelectionBehavior.SELECTION_BEHAVIOR_NONE, + SELECTION_BEHAVIOR_TRANSFER, + SelectionBehavior.SELECTION_BEHAVIOR_GO_TO_APP + }) + public @interface SelectionBehavior { + int SELECTION_BEHAVIOR_NONE = 0; + int SELECTION_BEHAVIOR_TRANSFER = 1; + int SELECTION_BEHAVIOR_GO_TO_APP = 2; + } + @VisibleForTesting int mType; @@ -213,7 +224,7 @@ public abstract class MediaDevice implements Comparable { * * @return selection behavior of device */ - @RouteListingPreference.Item.SubText + @SelectionBehavior public int getSelectionBehavior() { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE && mItem != null ? mItem.getSelectionBehavior() : SELECTION_BEHAVIOR_TRANSFER; diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java index 00e9a79a3213d..e307c49b2148d 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java @@ -16,13 +16,14 @@ package com.android.systemui.media.dialog; -import static android.media.RouteListingPreference.Item.SELECTION_BEHAVIOR_GO_TO_APP; -import static android.media.RouteListingPreference.Item.SELECTION_BEHAVIOR_NONE; -import static android.media.RouteListingPreference.Item.SELECTION_BEHAVIOR_TRANSFER; import static android.media.RouteListingPreference.Item.SUBTEXT_AD_ROUTING_DISALLOWED; import static android.media.RouteListingPreference.Item.SUBTEXT_DOWNLOADED_CONTENT_ROUTING_DISALLOWED; import static android.media.RouteListingPreference.Item.SUBTEXT_SUBSCRIPTION_REQUIRED; +import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_GO_TO_APP; +import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_NONE; +import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_TRANSFER; + import android.content.Context; import android.content.res.ColorStateList; import android.graphics.PorterDuff; diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java index 56e060d25850e..17d8799b4f845 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java @@ -16,12 +16,13 @@ package com.android.systemui.media.dialog; -import static android.media.RouteListingPreference.Item.SELECTION_BEHAVIOR_GO_TO_APP; -import static android.media.RouteListingPreference.Item.SELECTION_BEHAVIOR_NONE; import static android.media.RouteListingPreference.Item.SUBTEXT_AD_ROUTING_DISALLOWED; import static android.media.RouteListingPreference.Item.SUBTEXT_CUSTOM; import static android.media.RouteListingPreference.Item.SUBTEXT_SUBSCRIPTION_REQUIRED; +import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_GO_TO_APP; +import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_NONE; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.mock;