am d2169447: am 2bced6dc: am a7a46a66: Merge "Update cast screen strings." into klp-dev

* commit 'd21694476563e9a6efc833b78a141e9de2bb35d3':
  Update cast screen strings.
This commit is contained in:
Jeff Brown
2013-11-14 17:37:30 -08:00
committed by Android Git Automerger
4 changed files with 12 additions and 7 deletions

View File

@ -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,