mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-22 12:54:14 +01:00
OP-825 set minimum and target api versions to 14 & 17 respectively. Tidy formatting.
This commit is contained in:
parent
1a303aa85f
commit
3b5f3c8125
@ -1,60 +1,83 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="org.openpilot.androidgcs" android:versionCode="1"
|
package="org.openpilot.androidgcs"
|
||||||
android:versionName="1.0">
|
android:versionCode="1"
|
||||||
<uses-sdk android:minSdkVersion="14" />
|
android:versionName="1.0" >
|
||||||
|
|
||||||
|
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17"/>
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.BLUETOOTH" />
|
<uses-permission android:name="android.permission.BLUETOOTH" />
|
||||||
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
|
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||||
|
|
||||||
<uses-feature android:name="android.hardware.usb.host" />
|
<uses-feature android:name="android.hardware.usb.host" />
|
||||||
|
|
||||||
<application android:icon="@drawable/ic_logo" android:label="@string/app_name" android:theme="@android:style/Theme.Holo">
|
<application
|
||||||
|
android:icon="@drawable/ic_logo"
|
||||||
|
android:label="@string/app_name"
|
||||||
|
android:theme="@android:style/Theme.Holo"
|
||||||
|
android:allowBackup="false">
|
||||||
|
|
||||||
<!-- for map overlay -->
|
<!-- for map overlay -->
|
||||||
<uses-library android:name="com.google.android.maps" />
|
<uses-library android:name="com.google.android.maps" />
|
||||||
|
|
||||||
<!-- Object browser - main activity at the moment -->
|
<!-- Object browser - main activity at the moment -->
|
||||||
<activity android:name="HomePage" android:label="@string/app_name">
|
<activity
|
||||||
|
android:name="HomePage"
|
||||||
|
android:label="@string/app_name" >
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
|
||||||
<!-- <intent-filter> -->
|
<!-- <intent-filter> -->
|
||||||
<!-- <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" /> -->
|
<!-- <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" /> -->
|
||||||
<!-- </intent-filter> -->
|
<!-- </intent-filter> -->
|
||||||
|
|
||||||
<!-- <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" -->
|
|
||||||
<!-- android:resource="@xml/device_filter" /> -->
|
<!-- <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" -->
|
||||||
|
<!-- android:resource="@xml/device_filter" /> -->
|
||||||
</activity>
|
</activity>
|
||||||
|
<activity
|
||||||
<activity android:name="ObjectBrowser" android:label="@string/object_browser_name" />
|
android:name="ObjectBrowser"
|
||||||
<activity android:name="PfdActivity" android:label="PFD" />
|
android:label="@string/object_browser_name" />
|
||||||
<activity android:name="Controller" android:label="@string/controller_name" />
|
<activity
|
||||||
<activity android:name="Preferences" android:label="@string/preference_title" />
|
android:name="PfdActivity"
|
||||||
<activity android:name="UAVLocation" android:label="@string/location_name" />
|
android:label="PFD" />
|
||||||
<activity android:name="SystemAlarmActivity" android:label="System Alarms" />
|
<activity
|
||||||
<activity android:name="TuningActivity" android:label="Tuning" />
|
android:name="Controller"
|
||||||
<activity android:name="ObjectEditor" android:label="ObjectEditor"
|
android:label="@string/controller_name" />
|
||||||
|
<activity
|
||||||
|
android:name="Preferences"
|
||||||
|
android:label="@string/preference_title" />
|
||||||
|
<activity
|
||||||
|
android:name="UAVLocation"
|
||||||
|
android:label="@string/location_name" />
|
||||||
|
<activity
|
||||||
|
android:name="SystemAlarmActivity"
|
||||||
|
android:label="System Alarms" />
|
||||||
|
<activity
|
||||||
|
android:name="TuningActivity"
|
||||||
|
android:label="Tuning" />
|
||||||
|
<activity
|
||||||
|
android:name="ObjectEditor"
|
||||||
|
android:label="ObjectEditor"
|
||||||
android:theme="@android:style/Theme.Dialog" />
|
android:theme="@android:style/Theme.Dialog" />
|
||||||
<activity android:name="Logger" android:label="Logger"
|
<activity
|
||||||
|
android:name="Logger"
|
||||||
|
android:label="Logger"
|
||||||
android:theme="@android:style/Theme.Dialog" />
|
android:theme="@android:style/Theme.Dialog" />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name="FragmentTester"
|
android:name="FragmentTester"
|
||||||
android:label="FragmentTester" />
|
android:label="FragmentTester" />
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name="OsgViewer"
|
android:name="OsgViewer"
|
||||||
android:label="3DView" />
|
android:label="3DView" />
|
||||||
|
|
||||||
<receiver android:name="TelemetryWidget">
|
<receiver android:name="TelemetryWidget" >
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
|
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
@ -62,10 +85,14 @@
|
|||||||
<action android:name="org.openpilot.intent.action.CONNECTED" />
|
<action android:name="org.openpilot.intent.action.CONNECTED" />
|
||||||
<action android:name="org.openpilot.intent.action.DISCONNECTED" />
|
<action android:name="org.openpilot.intent.action.DISCONNECTED" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
<meta-data android:name="android.appwidget.provider"
|
|
||||||
|
<meta-data
|
||||||
|
android:name="android.appwidget.provider"
|
||||||
android:resource="@xml/telemetry_widget_info" />
|
android:resource="@xml/telemetry_widget_info" />
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
<service android:name="org.openpilot.androidgcs.telemetry.OPTelemetryService"></service>
|
<service android:name="org.openpilot.androidgcs.telemetry.OPTelemetryService" >
|
||||||
|
</service>
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
Loading…
x
Reference in New Issue
Block a user