diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index db928100660fcc736c1165d9d5d507a292a6a2e7..9877a86ce80370822ce5ec96257e63d3285e79c8 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -2,12 +2,9 @@
<manifest
package="org.briarproject.briar"
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
android:versionCode="13"
android:versionName="0.13">
- <uses-sdk tools:overrideLibrary="android.support.v14.preference"/>
-
<uses-feature android:name="android.hardware.bluetooth"/>
<uses-feature android:name="android.hardware.camera" />
@@ -47,7 +44,7 @@
android:label="@string/crash_report_title"
android:launchMode="singleInstance"
android:process=":briar_error_handler"
- android:theme="@style/BriarThemeNoActionBar.Default"
+ android:theme="@style/BriarTheme.NoActionBar"
android:windowSoftInputMode="stateHidden">
</activity>
@@ -70,7 +67,7 @@
<activity
android:name=".android.splash.SplashScreenActivity"
- android:theme="@style/BriarThemeNoActionBar.Default"
+ android:theme="@style/BriarTheme.NoActionBar"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -80,14 +77,14 @@
<activity
android:name=".android.navdrawer.NavDrawerActivity"
- android:theme="@style/BriarThemeNoActionBar.Default"
+ android:theme="@style/BriarTheme.NoActionBar"
android:launchMode="singleTop">
</activity>
<activity
android:name=".android.contact.ConversationActivity"
android:label="@string/app_name"
- android:theme="@style/BriarThemeNoActionBar.Default"
+ android:theme="@style/BriarTheme.NoActionBar"
android:parentActivityName=".android.navdrawer.NavDrawerActivity"
android:windowSoftInputMode="stateHidden|adjustResize">
<meta-data
@@ -111,7 +108,7 @@
android:name=".android.privategroup.conversation.GroupActivity"
android:label="@string/app_name"
android:parentActivityName=".android.navdrawer.NavDrawerActivity"
- android:theme="@style/BriarThemeNoActionBar.Default"
+ android:theme="@style/BriarTheme.NoActionBar"
android:windowSoftInputMode="adjustResize|stateHidden">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
@@ -195,7 +192,7 @@
android:name=".android.forum.ForumActivity"
android:label="@string/app_name"
android:parentActivityName=".android.navdrawer.NavDrawerActivity"
- android:theme="@style/BriarThemeNoActionBar.Default"
+ android:theme="@style/BriarTheme.NoActionBar"
android:windowSoftInputMode="adjustResize|stateHidden">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
@@ -248,7 +245,7 @@
<activity
android:name=".android.blog.BlogActivity"
android:parentActivityName=".android.navdrawer.NavDrawerActivity"
- android:theme="@style/BriarThemeNoActionBar.Default">
+ android:theme="@style/BriarTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".android.navdrawer.NavDrawerActivity"/>
@@ -310,7 +307,7 @@
<activity
android:name=".android.keyagreement.KeyAgreementActivity"
android:label="@string/add_contact_title"
- android:theme="@style/BriarThemeNoActionBar.Default"
+ android:theme="@style/BriarTheme.NoActionBar"
android:parentActivityName=".android.navdrawer.NavDrawerActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
diff --git a/briar-android/src/main/res/values/themes.xml b/briar-android/src/main/res/values/themes.xml
index 2890930d44301b6711dbc8afb0a5d2cf35ec230f..1676cf7dfcd1d0e28ecc400893727e1c322ef132 100644
--- a/briar-android/src/main/res/values/themes.xml
+++ b/briar-android/src/main/res/values/themes.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="BriarBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+ <style name="BriarTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/briar_primary</item>
<item name="colorPrimaryDark">@color/briar_primary_dark</item>
<item name="colorAccent">@color/briar_accent</item>
@@ -14,22 +14,16 @@
<item name="android:textColorTertiaryInverse">@color/briar_text_tertiary_inverse</item>
<item name="android:textColorLink">@color/briar_text_link</item>
<item name="android:windowAnimationStyle">@style/ActivityAnimation</item>
+
+ <!-- These fix a long-standing UI bug in the support preference library -->
+ <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+ <item name="android:listSeparatorTextViewStyle">@style/BriarTheme.ListSeparatorTextView</item>
</style>
- <style name="BriarThemeNoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
+ <style name="BriarTheme.NoActionBar" parent="BriarTheme">
+ <item name="windowActionBar">false</item>
+ <item name="windowNoTitle">true</item>
<item name="toolbarStyle">@style/BriarToolbar</item>
- <item name="colorPrimary">@color/briar_primary</item>
- <item name="colorPrimaryDark">@color/briar_primary_dark</item>
- <item name="colorAccent">@color/briar_primary</item>
- <item name="android:windowBackground">@color/window_background</item>
- <item name="android:textColorPrimary">@color/briar_text_primary</item>
- <item name="android:textColorPrimaryInverse">@color/briar_text_primary_inverse</item>
- <item name="android:textColorSecondary">@color/briar_text_secondary</item>
- <item name="android:textColorSecondaryInverse">@color/briar_text_secondary_inverse</item>
- <item name="android:textColorTertiary">@color/briar_text_tertiary</item>
- <item name="android:textColorTertiaryInverse">@color/briar_text_tertiary_inverse</item>
- <item name="android:textColorLink">@color/briar_text_link</item>
- <item name="android:windowAnimationStyle">@style/ActivityAnimation</item>
</style>
<style name="ActivityAnimation" parent="@android:style/Animation.Activity">
@@ -39,13 +33,6 @@
<item name="android:activityCloseExitAnimation">@anim/screen_new_out</item>
</style>
- <style name="BriarThemeNoActionBar.Default"/>
-
- <style name="BriarTheme" parent="BriarBaseTheme">
- <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
- <item name="android:listSeparatorTextViewStyle">@style/BriarTheme.ListSeparatorTextView</item>
- </style>
-
<style name="BriarDialogTheme" parent="Theme.AppCompat.Light.Dialog">
<item name="colorPrimary">@color/briar_primary</item>
<item name="colorPrimaryDark">@color/briar_primary_dark</item>
diff --git a/briar-android/src/test/java/org/briarproject/briar/android/forum/TestForumActivity.java b/briar-android/src/test/java/org/briarproject/briar/android/forum/TestForumActivity.java
index faa4faa10d27133d705ef935512e88040ba7c013..72b8d66448bfcff0d92accabdd47bf68ddc5f76f 100644
--- a/briar-android/src/test/java/org/briarproject/briar/android/forum/TestForumActivity.java
+++ b/briar-android/src/test/java/org/briarproject/briar/android/forum/TestForumActivity.java
@@ -1,7 +1,10 @@
package org.briarproject.briar.android.forum;
+import android.os.Bundle;
+
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityModule;
import org.briarproject.briar.android.activity.BaseActivity;
import org.briarproject.briar.android.controller.BriarController;
@@ -9,6 +12,8 @@ import org.briarproject.briar.android.controller.BriarControllerImpl;
import org.briarproject.briar.android.threaded.ThreadItemAdapter;
import org.mockito.Mockito;
+import javax.annotation.Nullable;
+
/**
* This class exposes the ForumController and offers the possibility to
* override it.
@@ -26,6 +31,12 @@ public class TestForumActivity extends ForumActivity {
return adapter;
}
+ @Override
+ public void onCreate(@Nullable Bundle state) {
+ setTheme(R.style.BriarTheme_NoActionBar);
+ super.onCreate(state);
+ }
+
@Override
protected ActivityModule getActivityModule() {
return new ActivityModule(this) {