Merge pull request #1076 from waylife/develop

fix issue #1073. crash on oneplus two(Android 5.1.1, Oxygen 2.0.0).
AntennaPod · Aug 15, 2015 · 269d54d · 269d54d
2 parents 773c862 + 2cd6a54
commit 269d54d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -36,8 +36,7 @@
         android:label="@string/app_name"
         android:backupAgent=".core.backup.OpmlBackupAgent"
         android:restoreAnyVersion="true"
-        android:logo="@drawable/ic_launcher"
-        android:theme="@style/Theme.AntennaPod.Light">
+        android:logo="@drawable/ic_launcher">
         <meta-data
             android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAI3a05VToCTlqBymJrbFGaKQMvF-bBAuLsOdavBA"/>

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -7,6 +7,7 @@
 import android.widget.LinearLayout;
 
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 /**
  * Displays the 'about' screen
@@ -18,6 +19,7 @@ public class AboutActivity extends ActionBarActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        setTheme(UserPreferences.getTheme());
         super.onCreate(savedInstanceState);
         getSupportActionBar().hide();
         setContentView(R.layout.about);