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

Commit 981d0508 authored by shaoweishen's avatar shaoweishen Committed by Automerger Merge Worker
Browse files

DO NOT MERGE: Downbranch merge conflict [Output Switcher] Decouple selection... 

DO NOT MERGE: Downbranch merge conflict [Output Switcher] Decouple selection behavior code am: 6bd94730

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



Change-Id: I92ca7d93d3d970db99758785cbfff96a8eb63096
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 183a47e5 6bd94730

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

+13 −2
Original line number Diff line number Diff line
@@ -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<MediaDevice> { 
        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<MediaDevice> { 
     *

     * @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;

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

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

packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java

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