Merge "Update string to enable transcode via MTP" into sc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6ee4bc3..26b6506 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10590,7 +10590,11 @@
<!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
select what the USB connection for this device should be used for. This choice
is for transcoding the files that are transferred via MTP. -->
- <string name="usb_transcode_files">Transcode exported media</string>
+ <string name="usb_transcode_files">Convert videos to AVC</string>
+ <!-- The summary text that appears when the user enables the 'Convert videos to AVC' option for
+ transcoding files to compatible formats before transferring them from the device to PC.
+ [CHAR LIMIT=NONE] -->
+ <string name="usb_transcode_files_summary">Videos will play on more media players, but quality may be reduced</string>
<!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
select what the USB connection for this device should be used for. This choice
is for transferring photos via PTP. -->
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
index 7ce8470..bbaaa31 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
@@ -55,6 +55,7 @@
mSwitchPreference = new SwitchPreference(mPreferenceCategory.getContext());
mSwitchPreference.setTitle(R.string.usb_transcode_files);
mSwitchPreference.setOnPreferenceClickListener(this);
+ mSwitchPreference.setSummaryOn(R.string.usb_transcode_files_summary);
mPreferenceCategory.addPreference(mSwitchPreference);
}