diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-08-01 09:53:37 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-08-01 09:53:37 -0400 |
| commit | 37481d731ad685230e439564b113972812b857a6 (patch) | |
| tree | 44fc01aed2ca66dd69b3c98a52a5c35e4eb609ef /res | |
| parent | 1cb10cd201aac827e03f0b985ef1737e3cbf802c (diff) | |
| download | packages_apps_settings-37481d731ad685230e439564b113972812b857a6.zip packages_apps_settings-37481d731ad685230e439564b113972812b857a6.tar.gz packages_apps_settings-37481d731ad685230e439564b113972812b857a6.tar.bz2 | |
USB Settings: Remove AFT installer CD; add help text to MTP and PTP widget summary
Bug: 4335199
Change-Id: I5f2a5d650a184b528028596e03e01ea98bf3815f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 24 | ||||
| -rw-r--r-- | res/xml/usb_settings.xml | 6 |
2 files changed, 14 insertions, 16 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index a0b45e9..407d159 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1780,23 +1780,19 @@ <string name="sd_ejecting_summary">Unmount in progress</string> <!-- Storage setting. Menu option for USB transfer settings [CHAR LIMIT=30]--> - <string name="storage_menu_usb">USB transfer settings</string> + <string name="storage_menu_usb">USB computer connection</string> <!-- Storage setting. Title for USB transfer settings [CHAR LIMIT=30]--> - <string name="storage_title_usb">USB transfer settings</string> + <string name="storage_title_usb">USB computer connection</string> <!-- Storage setting. USB connection category [CHAR LIMIT=30]--> <string name="usb_connection_category">Connect as</string> - <!-- Storage setting. Label for MTP setting [CHAR LIMIT=30]--> - <string name="usb_label_mtp">Media device (MTP)</string> - <!-- Storage setting. Label for PTP setting [CHAR LIMIT=30]--> - <string name="usb_label_ptp">Camera (PTP)</string> - <!-- Storage setting. Label for installer CD [CHAR LIMIT=30]--> - <string name="usb_label_installer_cd_done">Done installing Android File Transfer application for Mac</string> - <!-- Installer CD dialog title [CHAR LIMIT=30] --> - <string name="dlg_installer_cd_title">Android File Transfer app for Mac</string> - <!-- Installer CD dialog text [CHAR LIMIT=NONE] --> - <string name="dlg_installer_cd_text">Step 1:\nOn your Mac, double-click androidfiletransfer.msg\n\nStep 2:\nIn the Installer window, drag Android File Transfer to Applications.</string> - <!-- Installer CD dialog OK button text [CHAR LIMIT=NONE] --> - <string name="dlg_installer_cd_ok">Done following these steps</string> + <!-- Storage setting. Title for MTP checkbox [CHAR LIMIT=30]--> + <string name="usb_mtp_title">Media device (MTP)</string> + <!-- Storage setting. Summary for MTP checkbox [CHAR LIMIT=NONE]--> + <string name="usb_mtp_summary">Lets you transfer media files using Explorer or Windows Media Player on Windows, or the Android File Transfer application on Mac (available at www.android.com/filetransfer)</string> + <!-- Storage setting. Title for PTP checkbox [CHAR LIMIT=30]--> + <string name="usb_ptp_title">Camera (PTP)</string> + <!-- Storage setting. Summary for PTP checkbox [CHAR LIMIT=NONE]--> + <string name="usb_ptp_summary">Lets you transfer photos using camera software, and transfer any files on computers that don\'t support MTP</string> <!-- Phone info screen, section titles: --> <string name="battery_status_title">Battery status</string> diff --git a/res/xml/usb_settings.xml b/res/xml/usb_settings.xml index 28ef99b..4d6ccc9 100644 --- a/res/xml/usb_settings.xml +++ b/res/xml/usb_settings.xml @@ -22,12 +22,14 @@ <CheckBoxPreference android:key="usb_mtp" - android:title="@string/usb_label_mtp" + android:title="@string/usb_mtp_title" + android:summary="@string/usb_mtp_summary" /> <CheckBoxPreference android:key="usb_ptp" - android:title="@string/usb_label_ptp" + android:title="@string/usb_ptp_title" + android:summary="@string/usb_ptp_summary" /> </PreferenceScreen> |