From 2cd6a54631d98872ba2bf1e63149a5ab52f7d81c Mon Sep 17 00:00:00 2001 From: WangYun Date: Tue, 11 Aug 2015 00:04:59 +0800 Subject: [PATCH] fix issue #1073. crash on oneplus two(Android 5.1.1, Oxygen 2.0.0). --- app/src/main/AndroidManifest.xml | 3 +-- .../main/java/de/danoeh/antennapod/activity/AboutActivity.java | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 79c5ee6a4..469929fb1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,8 +37,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"> diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java index 811628ebf..035ab2f22 100644 --- 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.webkit.WebViewClient; 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);