diff options
| author | 2023-03-22 06:56:06 +0000 | |
|---|---|---|
| committer | 2023-03-22 06:56:06 +0000 | |
| commit | 736bea3fdae15f3a8558e68640fb622d11a54e96 (patch) | |
| tree | 48e38f0bbaab682900bb8ae824bfd39515518b22 | |
| parent | 1bcfd4f194b7b742525a4fcf0f3753a055779c84 (diff) | |
| parent | f1c2beaf8bc9a229e10d36cde2c6f7e157499e4e (diff) | |
Merge "[Output Switcher] Decouple selection behavior code" into udc-dev
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java index 071ab27f60b9..a9d15f3b4afe 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java @@ -97,7 +97,7 @@ public abstract class MediaDevice implements Comparable<MediaDevice> { @Retention(RetentionPolicy.SOURCE) @IntDef({SelectionBehavior.SELECTION_BEHAVIOR_NONE, - SELECTION_BEHAVIOR_TRANSFER, + SelectionBehavior.SELECTION_BEHAVIOR_TRANSFER, SelectionBehavior.SELECTION_BEHAVIOR_GO_TO_APP }) public @interface SelectionBehavior { 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 b71a91934314..6cf297c4885c 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java @@ -16,10 +16,6 @@ package com.android.systemui.media.dialog; -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; @@ -535,11 +531,12 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { @DoNotInline static Drawable getDeviceStatusIconBasedOnSelectionBehavior(MediaDevice device, Context context) { - switch (device.getSubtext()) { - case SUBTEXT_AD_ROUTING_DISALLOWED: - case SUBTEXT_DOWNLOADED_CONTENT_ROUTING_DISALLOWED: + switch (device.getSelectionBehavior()) { + case SELECTION_BEHAVIOR_NONE: return context.getDrawable(R.drawable.media_output_status_failed); - case SUBTEXT_SUBSCRIPTION_REQUIRED: + case SELECTION_BEHAVIOR_TRANSFER: + return null; + case SELECTION_BEHAVIOR_GO_TO_APP: return context.getDrawable(R.drawable.media_output_status_help); } return null; |