Skip to content

Commit

Permalink
Merge branch 'fix2' of https://github.com/opticod/haven into opticod-…
Browse files Browse the repository at this point in the history
…fix2
  • Loading branch information
n8fr8 committed Dec 27, 2017
2 parents 32e558a + 2c47b51 commit 9d0ac69
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<activity
android:name="org.havenapp.main.ListActivity"
android:label="@string/title_activity_start"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -35,15 +36,16 @@
<activity
android:name="org.havenapp.main.SettingsActivity"
android:label="@string/title_activity_start"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateHidden" />
<activity android:name="org.havenapp.main.ui.PPAppIntro"
android:screenOrientation="portrait"
/>
<activity
android:name="org.havenapp.main.MonitorActivity"
android:label="@string/app_name"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
android:configChanges="orientation|screenSize"
android:launchMode="singleTop" />

<service android:name="org.havenapp.main.service.MonitorService"
android:exported="false" />
Expand All @@ -64,6 +66,7 @@
<activity
android:name="org.havenapp.main.ui.EventActivity"
android:label="@string/title_activity_event"
android:configChanges="orientation|screenSize"
android:theme="@style/AppTheme" />
<activity android:name="org.havenapp.main.ui.MicrophoneConfigureActivity"
android:screenOrientation="portrait"/>
Expand Down

0 comments on commit 9d0ac69

Please sign in to comment.