PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0df39f39: am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI.

Browse Source 
* commit '0df39f39fcc45ff3efe92740ee46d7a762410b86':
  Integrate remote display routes into screen cast settings UI.
This commit is contained in:
Jeff Brown
2013-11-11 20:51:05 -08:00
committed by Android Git Automerger
parent 4366e49651 0df39f39fc
commit 71504b1f71
5 changed files with 268 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
res/values/strings.xml
View File

@@ -1226,37 +1226,22 @@
<string name="bluetooth_dock_settings_remember">Remember settings</string>
<!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
<string name="wifi_display_settings_title">Wireless display</string>
<!-- Wifi Display settings. Text displayed when Wifi display is off and device list is empty [CHAR LIMIT=80]-->
<string name="wifi_display_settings_empty_list_wifi_display_off">To see devices, turn wireless display on.</string>
<!-- Wifi Display settings. Text displayed when Wifi Display is off and device list is empty [CHAR LIMIT=80]-->
<string name="wifi_display_settings_empty_list_wifi_display_disabled">Wireless display is disabled because Wi\u2011Fi is off.</string>
<!-- Wifi Display settings. The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
<string name="wifi_display_search_for_devices">Search for displays</string>
<!-- Wifi Display settings. The title of the action button while a search for nearby devices is in progress [CHAR LIMIT=20] -->
<string name="wifi_display_searching_for_devices">Searching\u2026</string>
<string name="wifi_display_settings_title">Cast screen</string>
<!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->
<string name="wifi_display_enable_menu_item">Enable wireless display</string>
<!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
<string name="wifi_display_no_devices_found">No nearby wireless displays were found.</string>
<!-- Wifi Display settings. The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
<string name="wifi_display_paired_devices">Paired displays</string>
<!-- Wifi Display settings. The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
<string name="wifi_display_available_devices">Available devices</string>
<string name="wifi_display_no_devices_found">No nearby devices were found.</string>
<!-- Wifi Display settings. The status summary for connecting devices. [CHAR LIMIT=40] -->
<string name="wifi_display_status_connecting">Connecting</string>
<!-- Wifi Display settings. The status summary for connected devices. [CHAR LIMIT=40] -->
<string name="wifi_display_status_connected">Connected</string>
<!-- Wifi Display settings. The status summary for available devices. [CHAR LIMIT=40] -->
<string name="wifi_display_status_available">Available</string>
<!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
<string name="wifi_display_status_in_use">In use</string>
<!-- Wifi Display settings. The status summary for devices that's not available. [CHAR LIMIT=40] -->
<string name="wifi_display_status_not_available">Unavailable</string>
<!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
<string name="wifi_display_details">Display settings</string>
<!-- Wifi Display settings. Disconnect dialog. The title of the dialog. [CHAR LIMIT=40] -->
<string name="wifi_display_disconnect_title">Disconnect?</string>
<!-- Wifi Display settings. Disconnect dialog. Message for disconnecting from the display. [CHAR LIMIT=NONE] -->
<string name="wifi_display_disconnect_text">This will end your connection with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b></string>
<!-- Wifi Display settings. Options dialog. The title of the dialog. [CHAR LIMIT=40] -->
<string name="wifi_display_options_title">Wireless display options</string>
<!-- Wifi Display settings. Options dialog. The forget button text. [CHAR LIMIT=20] -->
@@ -1266,13 +1251,6 @@
<!-- Wifi Display settings. Options dialog. The name label used when prompting the user to rename the display. [CHAR LIMIT=20] -->
<string name="wifi_display_options_name">Name</string>
<!-- Wifi Display settings. Summary shown in Display settings. Text used for 'On' state. [CHAR LIMIT=40] -->
<string name="wifi_display_summary_on">On</string>
<!-- Wifi Display settings. Summary shown in Display settings. Text used for 'Off' state. [CHAR LIMIT=40] -->
<string name="wifi_display_summary_off">Off</string>
<!-- Wifi Display settings. Summary shown in Display settings. Text used for 'Disabled' state. [CHAR LIMIT=40] -->
<string name="wifi_display_summary_disabled">Disabled</string>
<!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->
<string name="wifi_display_certification_heading" translatable="false">Certification</string>
<!-- Wifi Display settings. The section title for wireless display session info. [CHAR LIMIT=40] -->