diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-02 12:53:28 -0800 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-03-02 13:59:56 -0800 |
| commit | b547fc297f24ce2d74fc86ef2a79a4424b6b4c59 (patch) | |
| tree | ded63280d3d01c34870807b0bcf458577ad1c9c6 /libs/usb/tests | |
| parent | 3dee21eb0f253a7e78572872b8dfc7b5d990a063 (diff) | |
| download | frameworks_base-b547fc297f24ce2d74fc86ef2a79a4424b6b4c59.zip frameworks_base-b547fc297f24ce2d74fc86ef2a79a4424b6b4c59.tar.gz frameworks_base-b547fc297f24ce2d74fc86ef2a79a4424b6b4c59.tar.bz2 | |
Combine the USB accessory support library with the platform feature
Also renamed the support library to com.android.future.usb.accessory.jar
Change-Id: Id6226991ce73f75dfedc497adf1c25bffb670243
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'libs/usb/tests')
| -rw-r--r-- | libs/usb/tests/AccessoryChat/Android.mk | 2 | ||||
| -rw-r--r-- | libs/usb/tests/AccessoryChat/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | libs/usb/tests/AccessoryChat/src/com/android/accessorychat/AccessoryChat.java (renamed from libs/usb/tests/AccessoryChat/src/com/google/android/accessorychat/AccessoryChat.java) | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libs/usb/tests/AccessoryChat/Android.mk b/libs/usb/tests/AccessoryChat/Android.mk index b854569..98b6090 100644 --- a/libs/usb/tests/AccessoryChat/Android.mk +++ b/libs/usb/tests/AccessoryChat/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := AccessoryChatGB -LOCAL_JAVA_LIBRARIES := com.google.android.usb +LOCAL_JAVA_LIBRARIES := com.android.future.usb.accessory # Force an old SDK version to make sure we aren't using newer UsbManager APIs LOCAL_SDK_VERSION := 8 diff --git a/libs/usb/tests/AccessoryChat/AndroidManifest.xml b/libs/usb/tests/AccessoryChat/AndroidManifest.xml index 5922421..97e2ade 100644 --- a/libs/usb/tests/AccessoryChat/AndroidManifest.xml +++ b/libs/usb/tests/AccessoryChat/AndroidManifest.xml @@ -1,8 +1,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.google.android.accessorychat"> + package="com.android.accessorychat"> <application> - <uses-library android:name="com.google.android.usb" /> + <uses-library android:name="com.android.future.usb.accessory" /> <activity android:name="AccessoryChat" android:label="Accessory Chat GB"> <intent-filter> @@ -19,5 +19,5 @@ android:resource="@xml/accessory_filter" /> </activity> </application> - <uses-sdk android:minSdkVersion="8" /> + <uses-sdk android:minSdkVersion="10" /> </manifest> diff --git a/libs/usb/tests/AccessoryChat/src/com/google/android/accessorychat/AccessoryChat.java b/libs/usb/tests/AccessoryChat/src/com/android/accessorychat/AccessoryChat.java index 0a5701c..5cf02c7 100644 --- a/libs/usb/tests/AccessoryChat/src/com/google/android/accessorychat/AccessoryChat.java +++ b/libs/usb/tests/AccessoryChat/src/com/android/accessorychat/AccessoryChat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.accessorychat; +package com.android.accessorychat; import android.app.Activity; import android.content.BroadcastReceiver; @@ -31,8 +31,8 @@ import android.util.Log; import android.widget.EditText; import android.widget.TextView; -import com.google.android.usb.UsbAccessory; -import com.google.android.usb.UsbManager; +import com.android.future.usb.UsbAccessory; +import com.android.future.usb.UsbManager; import java.io.FileDescriptor; import java.io.FileInputStream; |