diff options
author | Mike Lockwood <lockwood@android.com> | 2011-03-02 14:19:38 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-02 14:19:38 -0800 |
commit | 403af5c688eedbe191e7900c1c315286807caf7c (patch) | |
tree | 1bb8090c109cd6de047fcefad387f33f9a659986 /libs | |
parent | 4677c5118c29b5621ababc136b749f02a3d543d6 (diff) | |
parent | b547fc297f24ce2d74fc86ef2a79a4424b6b4c59 (diff) | |
download | frameworks_base-403af5c688eedbe191e7900c1c315286807caf7c.zip frameworks_base-403af5c688eedbe191e7900c1c315286807caf7c.tar.gz frameworks_base-403af5c688eedbe191e7900c1c315286807caf7c.tar.bz2 |
Merge "Combine the USB accessory support library with the platform feature"
Diffstat (limited to 'libs')
-rw-r--r-- | libs/usb/Android.mk | 2 | ||||
-rw-r--r-- | libs/usb/src/com/android/future/usb/UsbAccessory.java (renamed from libs/usb/src/com/google/android/usb/UsbAccessory.java) | 2 | ||||
-rw-r--r-- | libs/usb/src/com/android/future/usb/UsbManager.java (renamed from libs/usb/src/com/google/android/usb/UsbManager.java) | 2 | ||||
-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 |
6 files changed, 10 insertions, 10 deletions
diff --git a/libs/usb/Android.mk b/libs/usb/Android.mk index d0ef6f0..b4e1fbf 100644 --- a/libs/usb/Android.mk +++ b/libs/usb/Android.mk @@ -22,6 +22,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_MODULE_TAGS := optional -LOCAL_MODULE:= com.google.android.usb +LOCAL_MODULE:= com.android.future.usb.accessory include $(BUILD_JAVA_LIBRARY) diff --git a/libs/usb/src/com/google/android/usb/UsbAccessory.java b/libs/usb/src/com/android/future/usb/UsbAccessory.java index 931f42e..cdd2b73 100644 --- a/libs/usb/src/com/google/android/usb/UsbAccessory.java +++ b/libs/usb/src/com/android/future/usb/UsbAccessory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.usb; +package com.android.future.usb; /** * A class representing a USB accessory. diff --git a/libs/usb/src/com/google/android/usb/UsbManager.java b/libs/usb/src/com/android/future/usb/UsbManager.java index d7afb95..f74b291 100644 --- a/libs/usb/src/com/google/android/usb/UsbManager.java +++ b/libs/usb/src/com/android/future/usb/UsbManager.java @@ -15,7 +15,7 @@ */ -package com.google.android.usb; +package com.android.future.usb; import android.content.Context; import android.content.Intent; 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; |