projects
/
debian
/
openrocket
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement color indicators (green, yellow, red) for the Simulation Status in the...
[debian/openrocket]
/
android
/
AndroidManifest.xml
diff --git
a/android/AndroidManifest.xml
b/android/AndroidManifest.xml
index d39d7a27059bf6331c92b61c330cff7b0af2414c..daa4f0d62ceaaef9c3ed6c68c0f5c4286c0fdd1e 100644
(file)
--- a/
android/AndroidManifest.xml
+++ b/
android/AndroidManifest.xml
@@
-25,11
+25,6
@@
\r
<category android:name="android.intent.category.LAUNCHER" />
\r
</intent-filter>
\r
\r
<category android:name="android.intent.category.LAUNCHER" />
\r
</intent-filter>
\r
- </activity>
\r
- <activity
\r
- android:name=".android.rocket.OpenRocketLoaderActivity"
\r
- android:theme="@style/AppTheme.NoActionBar" >
\r
-
\r
<!--
\r
I don't understand why I need to have two different intent filters.
\r
Combining the <data> elements into a single field did not result in a working
\r
<!--
\r
I don't understand why I need to have two different intent filters.
\r
Combining the <data> elements into a single field did not result in a working
\r
@@
-61,7
+56,8
@@
android:scheme="file" />
\r
</intent-filter>
\r
</activity>
\r
android:scheme="file" />
\r
</intent-filter>
\r
</activity>
\r
- <activity android:name=".android.rocket.OpenRocketViewer" />
\r
+ <activity android:name=".android.rocket.OpenRocketViewer"
\r
+ android:windowSoftInputMode="adjustPan" />
\r
<activity android:name=".android.PreferencesActivity" >
\r
<intent-filter>
\r
<action android:name="net.sf.openrocket.android.PreferencesActivity" />
\r
<activity android:name=".android.PreferencesActivity" >
\r
<intent-filter>
\r
<action android:name="net.sf.openrocket.android.PreferencesActivity" />
\r
@@
-77,7
+73,11
@@
<activity
\r
android:name=".android.simulation.SimulationViewActivity"
\r
android:theme="@style/AppTheme.NoActionBar" />
\r
<activity
\r
android:name=".android.simulation.SimulationViewActivity"
\r
android:theme="@style/AppTheme.NoActionBar" />
\r
- <activity android:name=".android.filebrowser.SimpleFileBrowser" />
\r
+ <activity
\r
+ android:name=".android.filebrowser.SimpleFileBrowser"
\r
+ android:theme="@style/Theme.Sherlock.Dialog" />
\r
+
\r
+ <service android:name=".android.simservice.SimulationService" />
\r
</application>
\r
\r
</manifest>
\ No newline at end of file
</application>
\r
\r
</manifest>
\ No newline at end of file