Commit 18ae3881 authored by akwizgran's avatar akwizgran

Merge branch '1395-low-memory-crash' into 'master'

Don't use non-AppCompat theme for AppCompat activities

Closes #1395

See merge request !947
parents 87701e5f 775031e8
......@@ -387,7 +387,7 @@
<activity
android:name="org.briarproject.briar.android.panic.PanicResponderActivity"
android:noHistory="true"
android:theme="@android:style/Theme.NoDisplay">
android:theme="@style/Theme.AppCompat.NoActionBar">
<!-- this can never have launchMode singleTask or singleInstance! -->
<intent-filter>
<action android:name="info.guardianproject.panic.action.TRIGGER"/>
......@@ -397,12 +397,12 @@
<activity
android:name="org.briarproject.briar.android.logout.ExitActivity"
android:theme="@android:style/Theme.NoDisplay">
android:theme="@style/Theme.AppCompat.NoActionBar">
</activity>
<activity
android:name=".android.logout.HideUiActivity"
android:theme="@android:style/Theme.NoDisplay">
android:theme="@style/Theme.AppCompat.NoActionBar">
</activity>
<activity
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment