am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"

* commit '1183f487c8ea8660415fcd30914844e8dc2de2bb':
  MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
This commit is contained in:
Jean-Baptiste Queru
2012-08-23 09:47:04 -07:00
committed by Android Git Automerger
4 changed files with 52 additions and 3 deletions

View File

@@ -1900,6 +1900,10 @@
<!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. [CHAR LIMIT=80] -->
<string name="sd_format_summary" product="default">Erases all data on the SD card, such as music and photos</string>
<!-- SD card status when it is mounted as read only. Will be appended to size, starts with an unbreakable space -->
<!-- SD card & phone storage settings item summary that will result in the phone connected to PC and MTP/PTP enabled. [CHAR LIMIT=80] -->
<string name="mtp_ptp_mode_summary">MTP or PTP function is active</string>
<string name="read_only">\u0020(Read-only)</string>
<!-- SD card eject confirmation dialog title [CHAR LIMIT=25] -->
<string name="dlg_confirm_unmount_title" product="nosdcard">Unmount USB storage?</string>