From 01172e178b67518de684072e898f29d9f2b81952 Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Thu, 28 Jul 2011 12:47:44 -0400
Subject: [PATCH] Add preference category to USB transfer settings

This allows us to shorten the text for the file transfer options so they
will fit on a phone screen in portrait mode.

Change-Id: If664fd22061ddc1173e57b18799378e055e7135e
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 res/values/strings.xml   | 8 ++++----
 res/xml/usb_settings.xml | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7fd38c21092..48ddf642f3f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1781,12 +1781,12 @@
     <string name="storage_menu_usb">USB transfer settings</string>
     <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->
     <string name="storage_title_usb">USB transfer settings</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">Connect as a media device (MTP)</string>
+    <string name="usb_label_mtp">Media device (MTP)</string>
     <!-- Storage setting.  Label for PTP setting [CHAR LIMIT=30]-->
-    <string name="usb_label_ptp">Connect as a camera (PTP)</string>
-    <!-- Storage setting.  Label for installer CD [CHAR LIMIT=30]-->
-    <string name="usb_label_installer_cd">Install Android File Transfer application for Mac</string>
+    <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] -->
diff --git a/res/xml/usb_settings.xml b/res/xml/usb_settings.xml
index e2a950daddb..28ef99b4992 100644
--- a/res/xml/usb_settings.xml
+++ b/res/xml/usb_settings.xml
@@ -17,6 +17,9 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/location_settings_title">
 
+    <PreferenceCategory
+            android:title="@string/usb_connection_category" />
+
     <CheckBoxPreference
         android:key="usb_mtp"
         android:title="@string/usb_label_mtp"