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

Commit aa64b110 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "String change for video routing via MediaRouter; "HDMI" not "HDMI audio."" into jb-mr1-dev

parents fd4da14c 4131a373

core/res/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -3768,8 +3768,8 @@ 
    <!-- 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 audio</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 category. [CHAR LIMIT=50] -->

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

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ 
  <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_audio_route_name_hdmi" />

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

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

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

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

media/java/android/media/MediaRouter.java

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

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

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

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

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

                } else {

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

                }