diff options
| author | Nick Kralevich <nnk@google.com> | 2015-05-13 11:54:03 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2015-05-13 14:28:13 -0700 |
| commit | fcf10f7c12cb3107bdfedce6f76a8c866d154f3c (patch) | |
| tree | 54e502f36ee820d1fc74cc52e653b7547801df41 /core/res | |
| parent | 2047ce824030a2ea6227a7544789281530b7892d (diff) | |
| download | frameworks_base-fcf10f7c12cb3107bdfedce6f76a8c866d154f3c.zip frameworks_base-fcf10f7c12cb3107bdfedce6f76a8c866d154f3c.tar.gz frameworks_base-fcf10f7c12cb3107bdfedce6f76a8c866d154f3c.tar.bz2 | |
Modify how USB connections are handled.
* Introduce a new "charger only" mode. In this mode, MTP is disabled,
and no file transfers can occur.
* Make charger only mode the default.
* Modify "persist.sys.usb.config" so it now only holds the adb status.
* Make the USB settings non-persistent. Unplugging the USB connection will
reset the device back to "charger only" mode.
* Fixup wording per UI guidelines.
TODO: Re-implement MDM restrictions for USB / MTP access controls.
Bug: 18905620
Change-Id: I99a50d9132a81e98187f431166fd9fef4d437e4f
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/strings.xml | 10 | ||||
| -rwxr-xr-x | core/res/res/values/symbols.xml | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 5b564e1..39d7cac 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2916,18 +2916,20 @@ <!-- USB_STORAGE_ERROR dialog ok button--> <string name="dlg_ok">OK</string> + <!-- USB_PREFERENCES: Notification for when the user connected to the charger only. This is the title --> + <string name="usb_charging_notification_title">USB for charging</string> <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode. This is the title --> - <string name="usb_mtp_notification_title">Connected as a media device</string> + <string name="usb_mtp_notification_title">USB for file transfer</string> <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode. This is the title --> - <string name="usb_ptp_notification_title">Connected as a camera</string> + <string name="usb_ptp_notification_title">USB for photo transfer</string> <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode. This is the title --> - <string name="usb_midi_notification_title">Connected as a MIDI device</string> + <string name="usb_midi_notification_title">USB for MIDI</string> <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in mass storage mode (for installer CD image). This is the title --> <string name="usb_cd_installer_notification_title">Connected as an installer</string> <!-- USB_PREFERENCES: Notification for when a USB accessory is attached. This is the title --> <string name="usb_accessory_notification_title">Connected to a USB accessory</string> <!-- See USB_PREFERENCES. This is the message. --> - <string name="usb_notification_message">Touch for other USB options.</string> + <string name="usb_notification_message">Touch for more options.</string> <!-- External media format dialog strings --> <!-- This is the label for the activity, and should never be visible to the user. --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 8f949e1..0186c9d 100755 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1790,6 +1790,7 @@ <java-symbol type="string" name="usb_accessory_notification_title" /> <java-symbol type="string" name="usb_cd_installer_notification_title" /> <java-symbol type="string" name="usb_mtp_notification_title" /> + <java-symbol type="string" name="usb_charging_notification_title" /> <java-symbol type="string" name="usb_notification_message" /> <java-symbol type="string" name="use_physical_keyboard" /> <java-symbol type="string" name="usb_ptp_notification_title" /> |