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

Commit 816d1e39 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Android (Google) Code Review
Browse files

Merge "Change the route name for USB headset"

parents 0d6f5d2a 60aa8b99

core/res/res/values/strings.xml

+8 −5
Original line number Diff line number Diff line
@@ -3785,15 +3785,18 @@ 
         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->

    <string name="default_audio_route_name" product="default">Phone</string>



    <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->

    <string name="default_audio_route_name_dock_speakers">Dock speakers</string>



    <!-- Name of the default audio route when HDMI is connected. [CHAR LIMIT=50] -->

    <string name="default_audio_route_name_hdmi">HDMI</string>



    <!-- Name of the default audio route when wired headphones are

         connected. [CHAR LIMIT=50] -->

    <string name="default_audio_route_name_headphones">Headphones</string>



    <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->

    <string name="default_audio_route_name_dock_speakers">Dock speakers</string>



    <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->

    <string name="default_media_route_name_hdmi">HDMI</string>

    <!-- Name of the default audio route when USB is connected. [CHAR LIMIT=50] -->

    <string name="default_audio_route_name_usb">USB</string>



    <!-- Name of the default audio route category. [CHAR LIMIT=50] -->

    <string name="default_audio_route_category_name">System</string>

core/res/res/values/symbols.xml

+3 −2
Original line number Diff line number Diff line
@@ -1025,9 +1025,10 @@ 
  <java-symbol type="string" name="granularity_label_link" />

  <java-symbol type="string" name="granularity_label_line" />

  <java-symbol type="string" name="default_audio_route_name" />

  <java-symbol type="string" name="default_audio_route_name_headphones" />

  <java-symbol type="string" name="default_audio_route_name_dock_speakers" />

  <java-symbol type="string" name="default_media_route_name_hdmi" />

  <java-symbol type="string" name="default_audio_route_name_hdmi" />

  <java-symbol type="string" name="default_audio_route_name_headphones" />

  <java-symbol type="string" name="default_audio_route_name_usb" />

  <java-symbol type="string" name="default_audio_route_category_name" />

  <java-symbol type="string" name="stk_cc_ss_to_dial" />

  <java-symbol type="string" name="stk_cc_ss_to_ss" />

media/java/android/media/MediaRouter.java

+3 −1
Original line number Diff line number Diff line
@@ -193,7 +193,9 @@ public class MediaRouter { 
                } else if ((newRoutes.mainType&AudioRoutesInfo.MAIN_DOCK_SPEAKERS) != 0) {

                    name = com.android.internal.R.string.default_audio_route_name_dock_speakers;

                } else if ((newRoutes.mainType&AudioRoutesInfo.MAIN_HDMI) != 0) {

                    name = com.android.internal.R.string.default_media_route_name_hdmi;

                    name = com.android.internal.R.string.default_audio_route_name_hdmi;

                } else if ((newRoutes.mainType&AudioRoutesInfo.MAIN_USB) != 0) {

                    name = com.android.internal.R.string.default_audio_route_name_usb;

                } else {

                    name = com.android.internal.R.string.default_audio_route_name;

                }