diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-15 16:04:12 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-03-15 16:23:40 -0400 |
| commit | ad5f83e91b6812a6dee4fea7646fa9061d9f9597 (patch) | |
| tree | fe8baecc1a33a2e071c8887317413c4b327d1674 /libs | |
| parent | b0f72de87d1abdfec0cd188f277c48f65f7011a8 (diff) | |
| download | frameworks_base-ad5f83e91b6812a6dee4fea7646fa9061d9f9597.zip frameworks_base-ad5f83e91b6812a6dee4fea7646fa9061d9f9597.tar.gz frameworks_base-ad5f83e91b6812a6dee4fea7646fa9061d9f9597.tar.bz2 | |
USB Manager string clean up:
- Use "Cancel" instead of "Ignore"
- Customize the text for the "always use" checkbox for devices and accessories
- Clean up strings for AccessoryChat test program
Bug: 4074719
Change-Id: Ideec838e4c1f1a82ef4ae411c9124417ffb63165
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/usb/tests/AccessoryChat/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libs/usb/tests/AccessoryChat/AndroidManifest.xml b/libs/usb/tests/AccessoryChat/AndroidManifest.xml index 37ab29f..802b715 100644 --- a/libs/usb/tests/AccessoryChat/AndroidManifest.xml +++ b/libs/usb/tests/AccessoryChat/AndroidManifest.xml @@ -17,7 +17,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.accessorychat"> - <application> + <application android:label="Accessory Chat"> <uses-library android:name="com.android.future.usb.accessory" /> <activity android:name="AccessoryChat" android:label="Accessory Chat"> diff --git a/libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c b/libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c index c80b7c4..85b52dd 100644 --- a/libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c +++ b/libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c @@ -67,11 +67,11 @@ static void* write_thread(void* arg) { } static void milli_sleep(int millis) { - struct timespec tm; + struct timespec tm; - tm.tv_sec = 0; - tm.tv_nsec = millis * 1000000; - nanosleep(&tm, NULL); + tm.tv_sec = 0; + tm.tv_nsec = millis * 1000000; + nanosleep(&tm, NULL); } static void send_string(struct usb_device *device, int index, const char* string) { @@ -155,7 +155,7 @@ static int usb_device_added(const char *devname, void* client_data) { send_string(device, ACCESSORY_STRING_MANUFACTURER, "Google, Inc."); send_string(device, ACCESSORY_STRING_MODEL, "AccessoryChat"); - send_string(device, ACCESSORY_STRING_DESCRIPTION, "Sample Program"); + send_string(device, ACCESSORY_STRING_DESCRIPTION, "Accessory Chat"); send_string(device, ACCESSORY_STRING_VERSION, "1.0"); send_string(device, ACCESSORY_STRING_URI, "http://www.android.com"); send_string(device, ACCESSORY_STRING_SERIAL, "1234567890"); |