Changeset 1a53973 in orbit for android/AndroidManifest.xml
- Timestamp:
- 11/25/12 14:01:35 (10 years ago)
- Branches:
- master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid
- Children:
- 71aa88f
- Parents:
- 41c4762
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
android/AndroidManifest.xml
r3909100 r1a53973 1 <?xml version="1.0" encoding="utf-8"?> 1 2 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 2 3 package="info.puzzlebox.orbit" … … 5 6 6 7 <uses-sdk 7 android:minSdkVersion=" 8"8 android:minSdkVersion="15" 8 9 android:targetSdkVersion="15" /> 10 <uses-permission android:name="android.permission.BLUETOOTH"/> 11 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> 12 <uses-feature android:name="android.hardware.usb.host" /> 9 13 10 14 <application … … 14 18 <activity 15 19 android:name=".MainActivity" 16 android:label="@string/title_activity_main" > 17 <meta-data 18 android:name="android.support.PARENT_ACTIVITY" 19 android:value="android.app.ActivityGroup" /> 20 android:label="@string/app_name" > 21 <intent-filter> 22 <action android:name="android.intent.action.MAIN" /> 23 <category android:name="android.intent.category.DEFAULT" /> 24 <category android:name="android.intent.category.LAUNCHER" /> 25 </intent-filter> 26 <intent-filter> 27 <action 28 android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" /> 29 </intent-filter> 30 <meta-data 31 android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" 32 android:resource="@xml/device_filter" /> 33 20 34 </activity> 35 21 36 </application> 22 37 23 38 </manifest> 39 40 <!-- <manifest xmlns:android="http://schemas.android.com/apk/res/android" --> 41 <!-- package="info.puzzlebox.orbit" --> 42 <!-- android:versionCode="1" --> 43 <!-- android:versionName="1.0" > --> 44 45 <!-- <uses-sdk --> 46 <!-- android:minSdkVersion="15" --> 47 <!-- android:targetSdkVersion="15" /> --> 48 49 <!-- <application --> 50 <!-- android:icon="@drawable/ic_launcher" --> 51 <!-- android:label="@string/app_name" --> 52 <!-- android:theme="@style/AppTheme" > --> 53 <!-- <activity --> 54 <!-- android:name=".MainActivity" --> 55 <!-- android:label="@string/title_activity_main" > --> 56 <!-- <meta-data --> 57 <!-- android:name="android.support.PARENT_ACTIVITY" --> 58 <!-- android:value="android.app.ActivityGroup" /> --> 59 <!-- </activity> --> 60 <!-- </application> --> 61 62 <!-- </manifest> -->
Note: See TracChangeset
for help on using the changeset viewer.