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

Commit 21e18dc4 authored by Wenyu Zhang's avatar Wenyu Zhang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "rename-and-expand-MediaOutputController" into main 

* changes:
  Hook InputRouteManager into AudioSwitchController
  Rename MediaOutputController
parents 5a6ee431 5ef5012f

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public final class InputRouteManager { 
                }

            };



    /* package */ InputRouteManager(@NonNull Context context, @NonNull AudioManager audioManager) {

    public InputRouteManager(@NonNull Context context, @NonNull AudioManager audioManager) {

        mContext = context;

        mAudioManager = audioManager;

        Handler handler = new Handler(context.getMainLooper());

packages/SystemUI/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ filegroup { 
        "tests/src/**/systemui/clipboardoverlay/ClipboardListenerTest.java",

        "tests/src/**/systemui/doze/DozeScreenStateTest.java",

        "tests/src/**/systemui/keyguard/WorkLockActivityControllerTest.java",

        "tests/src/**/systemui/media/dialog/MediaOutputControllerTest.java",

        "tests/src/**/systemui/media/dialog/MediaSwitchingControllerTest.java",

        "tests/src/**/systemui/navigationbar/views/NavigationBarTest.java",

        "tests/src/**/systemui/power/PowerNotificationWarningsTest.java",

        "tests/src/**/systemui/power/PowerUITest.java",

packages/SystemUI/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -3114,6 +3114,10 @@ 
    <string name="media_output_group_title_speakers_and_displays">Speakers &amp; Displays</string>

    <!-- Title for Suggested Devices group. [CHAR LIMIT=NONE] -->

    <string name="media_output_group_title_suggested_device">Suggested Devices</string>

    <!-- Title for input device group. [CHAR LIMIT=NONE] -->

    <string name="media_input_group_title">Input</string>

    <!-- Title for output device group. [CHAR LIMIT=NONE] -->

    <string name="media_output_group_title">Output</string>

    <!-- Summary for end session dialog. [CHAR LIMIT=NONE] -->

    <string name="media_output_end_session_dialog_summary">Stop your shared session to move media to another device</string>

    <!-- Button text for stopping session [CHAR LIMIT=60] -->

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

+5 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
    private static final float DEVICE_CONNECTED_ALPHA = 1f;

    protected List<MediaItem> mMediaItemList = new CopyOnWriteArrayList<>();



    public MediaOutputAdapter(MediaOutputController controller) {

    public MediaOutputAdapter(MediaSwitchingController controller) {

        super(controller);

        setHasStableIds(true);

    }
@@ -531,8 +531,10 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
    @RequiresApi(34)

    private static class Api34Impl {

        @DoNotInline

        static View.OnClickListener getClickListenerBasedOnSelectionBehavior(MediaDevice device,

                MediaOutputController controller, View.OnClickListener defaultTransferListener) {

        static View.OnClickListener getClickListenerBasedOnSelectionBehavior(

                MediaDevice device,

                MediaSwitchingController controller,

                View.OnClickListener defaultTransferListener) {

            switch (device.getSelectionBehavior()) {

                case SELECTION_BEHAVIOR_NONE:

                    return null;

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

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public abstract class MediaOutputBaseAdapter extends 
    static final int CUSTOMIZED_ITEM_GROUP = 2;

    static final int CUSTOMIZED_ITEM_DYNAMIC_GROUP = 3;



    protected final MediaOutputController mController;

    protected final MediaSwitchingController mController;



    private static final int UNMUTE_DEFAULT_VOLUME = 2;
@@ -73,7 +73,7 @@ public abstract class MediaOutputBaseAdapter extends 
    int mCurrentActivePosition;

    private boolean mIsInitVolumeFirstTime;



    public MediaOutputBaseAdapter(MediaOutputController controller) {

    public MediaOutputBaseAdapter(MediaSwitchingController controller) {

        mController = controller;

        mIsDragging = false;

        mCurrentActivePosition = -1;
@@ -127,7 +127,7 @@ public abstract class MediaOutputBaseAdapter extends 
        return mCurrentActivePosition;

    }



    public MediaOutputController getController() {

    public MediaSwitchingController getController() {

        return mController;

    }