projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Add config and pyro tabs to graph widget
[fw/altos]
/
altosdroid
/
app
/
src
/
main
/
AndroidManifest.xml.in
diff --git
a/altosdroid/app/src/main/AndroidManifest.xml.in
b/altosdroid/app/src/main/AndroidManifest.xml.in
index 5fa07bac9a23bcaca1b2127708952332a25cfac4..d723432758cede166dfd9094e2d81d9da3982551 100644
(file)
--- a/
altosdroid/app/src/main/AndroidManifest.xml.in
+++ b/
altosdroid/app/src/main/AndroidManifest.xml.in
@@
-19,16
+19,17
@@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.altusmetrum.AltosDroid"
- android:versionCode="@ANDROID_VERSION@"
- android:versionName="@VERSION@">
- <uses-sdk android:targetSdkVersion="21" android:minSdkVersion="21"/>
+ package="org.altusmetrum.AltosDroid">
<!-- Google Maps -->
<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
<!-- Google Maps -->
<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
<!-- Permissions needed to access bluetooth -->
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<!-- Permissions needed to access bluetooth -->
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.BLUETOOTH" />
+ <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+ <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
<!-- Permissions needed to save Telemetry logs to SD card -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<!-- Permissions needed for GoogleMaps -->
<!-- Permissions needed to save Telemetry logs to SD card -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<!-- Permissions needed for GoogleMaps -->
@@
-47,11
+48,13
@@
<application android:label="@string/app_name"
android:icon="@drawable/app_icon"
android:allowBackup="true"
<application android:label="@string/app_name"
android:icon="@drawable/app_icon"
android:allowBackup="true"
- android:theme="@style/CustomTheme">
+ android:theme="@style/Medium">
+
<activity android:name="org.altusmetrum.AltosDroid.AltosDroid"
android:label="@string/app_name"
android:configChanges="orientation|keyboardHidden"
<activity android:name="org.altusmetrum.AltosDroid.AltosDroid"
android:label="@string/app_name"
android:configChanges="orientation|keyboardHidden"
- android:launchMode="singleTop">
+ android:launchMode="singleTop"
+ android:exported="true">
<intent-filter>
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.intent.action.MAIN" />
<intent-filter>
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.intent.action.MAIN" />
@@
-68,6
+71,11
@@
android:theme="@android:style/Theme.Dialog"
android:configChanges="orientation|keyboardHidden" />
android:theme="@android:style/Theme.Dialog"
android:configChanges="orientation|keyboardHidden" />
+ <activity android:name=".SelectTrackerActivity"
+ android:label="@string/select_tracker"
+ android:theme="@android:style/Theme.Dialog"
+ android:configChanges="orientation|keyboardHidden" />
+
<activity android:name=".PreloadMapActivity"
android:label="@string/preload_maps"
android:theme="@android:style/Theme.Dialog"
<activity android:name=".PreloadMapActivity"
android:label="@string/preload_maps"
android:theme="@android:style/Theme.Dialog"
@@
-88,13
+96,13
@@
android:theme="@android:style/Theme.Dialog"
android:configChanges="orientation|keyboardHidden" />
android:theme="@android:style/Theme.Dialog"
android:configChanges="orientation|keyboardHidden" />
- <activity android:name=".SetupActivity"
- android:label="@string/setup"
+
<activity android:name=".SetupActivity"
+
android:label="@string/setup"
android:theme="@android:style/Theme.Dialog"
android:configChanges="orientation" />
android:theme="@android:style/Theme.Dialog"
android:configChanges="orientation" />
-
- <activity android:name=".ManageFrequenciesActivity"
- android:label="@string/manage_frequencies"
+
+
<activity android:name=".ManageFrequenciesActivity"
+
android:label="@string/manage_frequencies"
android:theme="@android:style/Theme.Dialog"
android:configChanges="orientation|keyboard" />
android:theme="@android:style/Theme.Dialog"
android:configChanges="orientation|keyboard" />