Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-21 15:19:53 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Don't use non-AppCompat theme for AppCompat activities

Closes #1395

See merge request briar/briar!947
This commit is contained in:
akwizgran
2018-10-08 12:03:20 +00:00
parent 87701e5f07 775031e893
commit 18ae388137
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/main/AndroidManifest.xml
View File

@@ -387,7 +387,7 @@
<activity <activity
android:name="org.briarproject.briar.android.panic.PanicResponderActivity" android:name="org.briarproject.briar.android.panic.PanicResponderActivity"
android:noHistory="true" android:noHistory="true"
android:theme="@android:style/Theme.NoDisplay"> android:theme="@style/Theme.AppCompat.NoActionBar">
<!-- this can never have launchMode singleTask or singleInstance! --> <!-- this can never have launchMode singleTask or singleInstance! -->
<intent-filter> <intent-filter>
<action android:name="info.guardianproject.panic.action.TRIGGER"/> <action android:name="info.guardianproject.panic.action.TRIGGER"/>
@@ -397,12 +397,12 @@
<activity <activity
android:name="org.briarproject.briar.android.logout.ExitActivity" android:name="org.briarproject.briar.android.logout.ExitActivity"
android:theme="@android:style/Theme.NoDisplay"> android:theme="@style/Theme.AppCompat.NoActionBar">
</activity> </activity>
<activity <activity
android:name=".android.logout.HideUiActivity" android:name=".android.logout.HideUiActivity"
android:theme="@android:style/Theme.NoDisplay"> android:theme="@style/Theme.AppCompat.NoActionBar">
</activity> </activity>
<activity <activity