Changeset 1a53973 in orbit for android/AndroidManifest.xml

Timestamp:

11/25/12 14:01:35 (9 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid

Children:

71aa88f

Parents:

41c4762

Message:

android:

• initial release for Instructable (Chapter 2)

arduino:

• disabling BlueSMiRF

File:

• android/AndroidManifest.xml (modified) (3 diffs)

android/AndroidManifest.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="info.puzzlebox.orbit"
@@ -5 +6 @@
 
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="15"
         android:targetSdkVersion="15" />
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-feature android:name="android.hardware.usb.host" />
 
     <application
@@ -14 +18 @@
         <activity
             android:name=".MainActivity"
-            android:label="@string/title_activity_main" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="android.app.ActivityGroup" />
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+<category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+<intent-filter>
+    <action
+        android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
+</intent-filter>
+<meta-data
+    android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
+    android:resource="@xml/device_filter" />
+        
         </activity>
+        
     </application>
 
 </manifest>
+
+<!-- <manifest xmlns:android="http://schemas.android.com/apk/res/android" -->
+<!--     package="info.puzzlebox.orbit" -->
+<!--     android:versionCode="1" -->
+<!--     android:versionName="1.0" > -->
+
+<!--     <uses-sdk -->
+<!--         android:minSdkVersion="15" -->
+<!--         android:targetSdkVersion="15" /> -->
+
+<!--     <application -->
+<!--         android:icon="@drawable/ic_launcher" -->
+<!--         android:label="@string/app_name" -->
+<!--         android:theme="@style/AppTheme" > -->
+<!--         <activity -->
+<!--             android:name=".MainActivity" -->
+<!--             android:label="@string/title_activity_main" > -->
+<!--             <meta-data -->
+<!--                 android:name="android.support.PARENT_ACTIVITY" -->
+<!--                 android:value="android.app.ActivityGroup" /> -->
+<!--         </activity> -->
+<!--     </application> -->
+
+<!-- </manifest> -->