Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 261ed042 authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Output Switcher] Decouple selection behavior code" into udc-dev am: 736bea3f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22090728



Change-Id: I74e478374163baecf7c6f9eac8e800325bc01fcc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de36f99f 736bea3f

packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java

+1 −1
Original line number Diff line number Diff line
@@ -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 {

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java

+5 −8
Original line number Diff line number Diff line
@@ -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;