diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu/storage.xml | 21 | ||||
| -rw-r--r-- | res/menu/storage_volume.xml | 3 | ||||
| -rw-r--r-- | res/values/arrays.xml | 8 | ||||
| -rw-r--r-- | res/values/strings.xml | 23 |
4 files changed, 29 insertions, 26 deletions
diff --git a/res/menu/storage.xml b/res/menu/storage.xml deleted file mode 100644 index 2e4c660..0000000 --- a/res/menu/storage.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:id="@+id/storage_usb" - android:title="@string/storage_menu_usb" /> -</menu> diff --git a/res/menu/storage_volume.xml b/res/menu/storage_volume.xml index b461f46..efa468c 100644 --- a/res/menu/storage_volume.xml +++ b/res/menu/storage_volume.xml @@ -30,7 +30,4 @@ <item android:id="@+id/storage_migrate" android:title="@string/storage_menu_migrate" /> - <item - android:id="@+id/storage_usb" - android:title="@string/storage_menu_usb" /> </menu> diff --git a/res/values/arrays.xml b/res/values/arrays.xml index d556b1b..1af15f9 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1365,4 +1365,12 @@ <item>0</item> </string-array> + <!-- These values must match up with the code in UsbModeChooserActivity.java. --> + <string-array name="usb_available_functions"> + <item>@string/usb_use_charging_only</item> + <item>@string/usb_use_file_transfers</item> + <item>@string/usb_use_photo_transfers</item> + <item>@string/usb_use_MIDI</item> + </string-array> + </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 53df0ef..08e6c23 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2293,8 +2293,6 @@ <string name="storage_menu_migrate">Migrate data</string> <!-- Storage setting. Menu option for forgetting a storage device [CHAR LIMIT=30]--> <string name="storage_menu_forget">Forget</string> - <!-- Storage setting. Menu option for USB transfer settings [CHAR LIMIT=30]--> - <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 computer connection</string> @@ -6601,4 +6599,25 @@ <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] --> <string name="additional_permissions_more"><xliff:g id="count" example="2">%1$d</xliff:g> more</string> + <!-- 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 charging only. --> + <string name="usb_use_charging_only">Charging only</string> + <!-- 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 files via MTP. --> + <string name="usb_use_file_transfers">Transfer files (MTP)</string> + <!-- 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. --> + <string name="usb_use_photo_transfers">Transfer photos (PTP)</string> + <!-- 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 entering MIDI mode. --> + <string name="usb_use_MIDI">MIDI</string> + <!-- The title used in a dialog which lets the user select what the USB connection + for this device should be used for. Choices are usb_use_charging_only, + usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI --> + <string name="usb_use">Use USB for</string> + </resources> |