diff options
| author | Erik Gilling <konkers@android.com> | 2011-04-04 12:00:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-04 12:00:11 -0700 |
| commit | 43d822eb4aef341dde18a934f0401ccf2f6b0868 (patch) | |
| tree | 094bdc198583e9471bd13f134d91eac0e25b89c5 | |
| parent | 9ee882cb9ee8760d0f2e3a2b5bec6e9ae34eca14 (diff) | |
| parent | ae2ea53c2757ab889fb2ab0cd9e57f44831480d3 (diff) | |
| download | demokit-43d822eb4aef341dde18a934f0401ccf2f6b0868.tar.gz | |
Merge "rename package path" into gingerbread
| -rw-r--r-- | demokit/app/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | demokit/app/src/com/google/android/DemoKit/DemoKitActivity.java (renamed from demokit/app/src/com/google/DemoKit/DemoKitActivity.java) | 4 | ||||
| -rw-r--r-- | demokit/app/src/com/google/android/DemoKit/UsbAccessoryActivity.java (renamed from demokit/app/src/com/google/DemoKit/UsbAccessoryActivity.java) | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/demokit/app/AndroidManifest.xml b/demokit/app/AndroidManifest.xml index e9e63bd..40056c4 100644 --- a/demokit/app/AndroidManifest.xml +++ b/demokit/app/AndroidManifest.xml @@ -15,7 +15,7 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.google.DemoKit" + package="com.google.android.DemoKit" android:versionCode="1" android:versionName="1.0"> diff --git a/demokit/app/src/com/google/DemoKit/DemoKitActivity.java b/demokit/app/src/com/google/android/DemoKit/DemoKitActivity.java index a43fea2..d066f8b 100644 --- a/demokit/app/src/com/google/DemoKit/DemoKitActivity.java +++ b/demokit/app/src/com/google/android/DemoKit/DemoKitActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.DemoKit; +package com.google.android.DemoKit; import android.app.Activity; import android.app.PendingIntent; @@ -48,7 +48,7 @@ public class DemoKitActivity extends Activity implements Runnable, SeekBar.OnSee private static final String TAG = "DemoKit"; private static final String ACTION_USB_PERMISSION = - "com.google.DemoKit.action.USB_PERMISSION"; + "com.google.android.DemoKit.action.USB_PERMISSION"; private UsbManager mUsbManager; private PendingIntent mPermissionIntent; diff --git a/demokit/app/src/com/google/DemoKit/UsbAccessoryActivity.java b/demokit/app/src/com/google/android/DemoKit/UsbAccessoryActivity.java index d451e38..f6a6ae5 100644 --- a/demokit/app/src/com/google/DemoKit/UsbAccessoryActivity.java +++ b/demokit/app/src/com/google/android/DemoKit/UsbAccessoryActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.DemoKit; +package com.google.android.DemoKit; import android.app.Activity; |