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

Commit a242ce45 authored by Alexandr Shabalin's avatar Alexandr Shabalin Committed by Android (Google) Code Review
Browse files

Merge "Replace "Suggested devices" with "Suggested" for the updated UI." into main

parents c0e96c22 babda33c

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -3363,6 +3363,8 @@ 
    <string name="media_output_group_title_connected_speakers">Connected speakers</string>

    <!-- Title for Speakers and Displays group. [CHAR LIMIT=NONE] -->

    <string name="media_output_group_title_speakers_and_displays">Speakers &amp; Displays</string>

    <!-- Title for the Suggested section in the Output Switcher device list. [CHAR LIMIT=NONE] -->

    <string name="media_output_group_title_suggested">Suggested</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] -->

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

+5 −4
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.systemui.media.dialog;



import static com.android.media.flags.Flags.enableOutputSwitcherRedesign;



import android.content.Context;



import androidx.annotation.Nullable;
@@ -74,10 +76,9 @@ public class OutputMediaItemListProxy { 
        List<MediaItem> finalMediaItems = new CopyOnWriteArrayList<>();

        finalMediaItems.addAll(mSelectedMediaItems);

        if (!mSuggestedMediaItems.isEmpty()) {

            finalMediaItems.add(

                    MediaItem.createGroupDividerMediaItem(

                            mContext.getString(

                                    R.string.media_output_group_title_suggested_device)));

            finalMediaItems.add(MediaItem.createGroupDividerMediaItem(mContext.getString(

                    enableOutputSwitcherRedesign() ? R.string.media_output_group_title_suggested

                            : R.string.media_output_group_title_suggested_device)));

            finalMediaItems.addAll(mSuggestedMediaItems);

        }

        if (!mSpeakersAndDisplaysMediaItems.isEmpty()) {