From 6bd94730072d9ff079cab565be3e2a931292c6e9 Mon Sep 17 00:00:00 2001 From: shaoweishen Date: Tue, 21 Feb 2023 13:38:43 +0000 Subject: DO NOT MERGE: Downbranch merge conflict [Output Switcher] Decouple selection behavior code Bug: 269703576 Test: atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest Change-Id: I0e57a2fb3a61079a1ffc7f52e914ac100dabdab1 (cherry picked from commit 134521d11a9921be604f9ab1cb1ece9627c42ffa) --- .../src/com/android/settingslib/media/MediaDevice.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'packages/SettingsLib/src') diff --git a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java index 6b9866bf05e0..071ab27f60b9 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; -- cgit v1.2.3-59-g8ed1b