projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump java lib versions in preparation for 1.9.2
[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 89f97d6ac71b0856416ad66c26f15cc95de232e5..efedddaf5555b4526bab4e615143a7b367579a13 100644
(file)
--- a/
altosdroid/app/src/main/AndroidManifest.xml.in
+++ b/
altosdroid/app/src/main/AndroidManifest.xml.in
@@
-46,11
+46,12
@@
<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">
<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" />
@@
-67,6
+68,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"
@@
-87,13
+93,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" />