commit 67fdad9d1e1a00d71a1c5c470f7f4803679d5574
author Adam Powell <adamp@google.com> Fri Sep 28 12:59:54 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 28 12:59:54 2012 -0700
tree 5a0f59f2a5427bce78fa9bc25d3569cadcb90f42
parent 82c0eba3f722fe8ca412baeabcb6494ff7ddea5f
parent aa64b11020c5283509c7ef37ecfe274a4f6b45f4

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

* commit 'aa64b11020c5283509c7ef37ecfe274a4f6b45f4':
  String change for video routing via MediaRouter; "HDMI" not "HDMI audio."

core/res/res/values/strings.xml

diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 370ed88..1b56c29 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -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

diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index ae44bee..e16dd33 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -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

diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java
index 19bd327..36c9c70 100644
--- a/media/java/android/media/MediaRouter.java
+++ b/media/java/android/media/MediaRouter.java
@@ -135,7 +135,7 @@
                 } 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;
                 }