drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'a7a46a66fa9f9ce547bac6c2e800a0ae287d9e5c':
  Update cast screen strings.
This commit is contained in:
Jeff Brown
2013-11-14 17:31:32 -08:00
committed by Android Git Automerger
parent caf21486df a7a46a66fa
commit 2bced6dcb5
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/app/MediaRouteChooserDialog.java
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,

11
core/res/res/values/strings.xml
View File

@ -4099,9 +4099,12 @@
<!-- Content description of a MediaRouteButton for accessibility support -->
<string name="media_route_button_content_description">Media output</string>
<!-- Title of the media route chooser dialog. [CHAR LIMIT=30] -->
<!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
<string name="media_route_chooser_title">Connect to device</string>
<!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
<string name="media_route_chooser_title_for_remote_display">Cast screen to device</string>
<!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
<string name="media_route_chooser_searching">Searching for devices\u2026</string>
@ -4144,11 +4147,11 @@
<string name="display_manager_overlay_display_secure_suffix">, secure</string>
<!-- Title of the notification to indicate the process of connecting to a wifi display. [CHAR LIMIT=50] -->
<string name="wifi_display_notification_connecting_title">Starting screen cast</string>
<!-- Message of the notification to indicate the process of connectig to a wifi display. [CHAR LIMIT=80] -->
<string name="wifi_display_notification_connecting_title">Casting screen</string>
<!-- Message of the notification to indicate the process of connecting to a wifi display. [CHAR LIMIT=80] -->
<string name="wifi_display_notification_connecting_message">Connecting to <xliff:g id="name">%1$s</xliff:g></string>
<!-- Title of the notification to indicate an active wifi display connection. [CHAR LIMIT=50] -->
<string name="wifi_display_notification_connected_title">Screen cast in progress</string>
<string name="wifi_display_notification_connected_title">Casting screen</string>
<!-- Message of the notification to indicate an active wifi display connection. [CHAR LIMIT=80] -->
<string name="wifi_display_notification_connected_message">Connected to <xliff:g id="name">%1$s</xliff:g></string>
<!-- Label of a button to disconnect an active wifi display connection. [CHAR LIMIT=25] -->

1
core/res/res/values/symbols.xml
View File

@ -1267,6 +1267,7 @@
<java-symbol type="id" name="media_route_disconnect_button" />
<java-symbol type="id" name="media_route_extended_settings_button" />
<java-symbol type="string" name="media_route_chooser_title" />
<java-symbol type="string" name="media_route_chooser_title_for_remote_display" />
<java-symbol type="string" name="bluetooth_a2dp_audio_route_name" />
<java-symbol type="dimen" name="config_minScalingSpan" />

2
packages/SystemUI/res/values/strings.xml
View File

@ -491,7 +491,7 @@
<!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
<string name="quick_settings_wifi_off_label">Wi-Fi Off</string>
<!-- QuickSettings: Remote display [CHAR LIMIT=NONE] -->
<string name="quick_settings_remote_display_no_connection_label">Screen Cast</string>
<string name="quick_settings_remote_display_no_connection_label">Cast Screen</string>
<!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
<string name="quick_settings_brightness_dialog_title">Brightness</string>
<!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->