diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-09-19 11:16:52 -0700 |
|---|---|---|
| committer | Mike Lockwood <lockwood@google.com> | 2015-01-29 12:59:28 -0800 |
| commit | 2a57bc7fd602853dc1a22dcee1ff50f92cc29060 (patch) | |
| tree | e00162b144fa4ab438e197e695c979935fde2d53 /core | |
| parent | 293b7b4fe510bf7df879e89bf748c0b8695f4310 (diff) | |
| download | frameworks_base-2a57bc7fd602853dc1a22dcee1ff50f92cc29060.zip frameworks_base-2a57bc7fd602853dc1a22dcee1ff50f92cc29060.tar.gz frameworks_base-2a57bc7fd602853dc1a22dcee1ff50f92cc29060.tar.bz2 | |
MidiManager: Add USB peripheral MIDI support
This allows the android device to appear as a USB MIDI device to
a USB host (like a Mac or a PC) using the f_midi USB gadget driver.
Change-Id: I14f1ba73bcce2c894e77efb8810beac4ffe246d8
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/hardware/usb/UsbManager.java | 10 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 5 | ||||
| -rwxr-xr-x | core/res/res/values/symbols.xml | 3 |
3 files changed, 18 insertions, 0 deletions
diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java index f64ef87..f283051 100644 --- a/core/java/android/hardware/usb/UsbManager.java +++ b/core/java/android/hardware/usb/UsbManager.java @@ -68,6 +68,8 @@ public class UsbManager { * accessory function is enabled * <li> {@link #USB_FUNCTION_AUDIO_SOURCE} boolean extra indicating whether the * audio source function is enabled + * <li> {@link #USB_FUNCTION_MIDI} boolean extra indicating whether the + * MIDI function is enabled * </ul> * * {@hide} @@ -188,6 +190,14 @@ public class UsbManager { public static final String USB_FUNCTION_AUDIO_SOURCE = "audio_source"; /** + * Name of the MIDI USB function. + * Used in extras for the {@link #ACTION_USB_STATE} broadcast + * + * {@hide} + */ + public static final String USB_FUNCTION_MIDI = "midi"; + + /** * Name of the Accessory USB function. * Used in extras for the {@link #ACTION_USB_STATE} broadcast * diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index f51e82c..efdc3c8 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5188,4 +5188,9 @@ <string name="stk_cc_ss_to_ussd">SS request is modified to USSD request.</string> <string name="stk_cc_ss_to_ss">SS request is modified to new SS request.</string> + <!-- Manufacturer name for USB MIDI Peripheral port --> + <string name="usb_midi_peripheral_manufacturer_name">Android</string> + <!-- Model name for USB MIDI Peripheral port --> + <string name="usb_midi_peripheral_model_name">USB Peripheral Port</string> + </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index b04349e..607744f 100755 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2156,4 +2156,7 @@ <java-symbol type="bool" name="config_use_sim_language_file" /> <java-symbol type="bool" name="config_LTE_eri_for_network_name" /> <java-symbol type="bool" name="config_defaultInTouchMode" /> + + <java-symbol type="string" name="usb_midi_peripheral_manufacturer_name" /> + <java-symbol type="string" name="usb_midi_peripheral_model_name" /> </resources> |