diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/radio_with_summary.xml | 2 | ||||
| -rw-r--r-- | res/layout/usb_dialog_container.xml | 30 | ||||
| -rw-r--r-- | res/values/strings.xml | 38 |
3 files changed, 62 insertions, 8 deletions
diff --git a/res/layout/radio_with_summary.xml b/res/layout/radio_with_summary.xml index 9c37050..8df1210 100644 --- a/res/layout/radio_with_summary.xml +++ b/res/layout/radio_with_summary.xml @@ -36,7 +36,7 @@ android:ellipsize="marquee" /> - <TextView android:id="@+android:id/summary" + <TextView android:id="@android:id/summary" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingBottom="4dp" diff --git a/res/layout/usb_dialog_container.xml b/res/layout/usb_dialog_container.xml new file mode 100644 index 0000000..e145911 --- /dev/null +++ b/res/layout/usb_dialog_container.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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. +--> + +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="10dp" + android:paddingBottom="5dp"> + + <LinearLayout + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" /> + +</ScrollView> diff --git a/res/values/strings.xml b/res/values/strings.xml index c269b99..3be6000 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6760,22 +6760,46 @@ <!-- 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 + <!-- 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 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 + <string name="usb_use_charging_only">Charging</string> + <!-- Decription 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 charging only. --> + <string name="usb_use_charging_only_desc">Just charge this device</string> + <!-- 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 powering the other device only. --> + <string name="usb_use_power_only">Power supply</string> + <!-- Decription 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 powering the other device only. --> + <string name="usb_use_power_only_desc">Charge the other connected device</string> + <!-- 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 transferring files via MTP. --> + <string name="usb_use_file_transfers">File transfers</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 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 + <string name="usb_use_file_transfers_desc">Transfer files to Windows or Mac (MTP)</string> + <!-- 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 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 + <string name="usb_use_photo_transfers">Photo transfer (PTP)</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. --> + <string name="usb_use_photo_transfers_desc">Transfer photos or files if MTP is not supported (PTP)</string> + <!-- 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 entering MIDI mode. --> <string name="usb_use_MIDI">MIDI</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 entering MIDI mode. --> + <string name="usb_use_MIDI_desc">Use device for MIDI input</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 --> |