summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2013-11-14 17:35:00 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-14 17:35:00 -0800
commitd21694476563e9a6efc833b78a141e9de2bb35d3 (patch)
tree12536d687798ea59ad039e1be7c5aea48ef2908b /core/java
parentab53cbea9e2583300a91fe4eeb5a28a3323c8b9d (diff)
parent2bced6dcb53c1743d6d11ffcb213206a07a63737 (diff)
downloadframeworks_base-d21694476563e9a6efc833b78a141e9de2bb35d3.zip
frameworks_base-d21694476563e9a6efc833b78a141e9de2bb35d3.tar.gz
frameworks_base-d21694476563e9a6efc833b78a141e9de2bb35d3.tar.bz2
am 2bced6dc: am a7a46a66: Merge "Update cast screen strings." into klp-dev
* commit '2bced6dcb53c1743d6d11ffcb213206a07a63737': Update cast screen strings.
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/app/MediaRouteChooserDialog.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/MediaRouteChooserDialog.java b/core/java/com/android/internal/app/MediaRouteChooserDialog.java
index 944cc83..47d2a9c 100644
--- a/core/java/com/android/internal/app/MediaRouteChooserDialog.java
+++ b/core/java/com/android/internal/app/MediaRouteChooserDialog.java
@@ -35,7 +35,6 @@ import android.widget.ListView;
import android.widget.TextView;
import java.util.Comparator;
-import java.util.List;
/**
* This class implements the route chooser dialog for {@link MediaRouter}.
@@ -125,7 +124,9 @@ public class MediaRouteChooserDialog extends Dialog {
getWindow().requestFeature(Window.FEATURE_LEFT_ICON);
setContentView(R.layout.media_route_chooser_dialog);
- setTitle(R.string.media_route_chooser_title);
+ setTitle(mRouteTypes == MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY
+ ? R.string.media_route_chooser_title_for_remote_display
+ : R.string.media_route_chooser_title);
// Must be called after setContentView.
getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON,