diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-08-15 14:58:28 -0400 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-08-15 14:58:28 -0400 |
| commit | 269d54d465675e2f6e2583bc693a50cf42085922 (patch) | |
| tree | 36b8e34727ea2c36e07aef189bcda1d3a8473dc9 | |
| parent | 773c8626cc675ff1928679e2d314b5f58d482541 (diff) | |
| parent | 2cd6a54631d98872ba2bf1e63149a5ab52f7d81c (diff) | |
| download | AntennaPod-269d54d465675e2f6e2583bc693a50cf42085922.zip | |
Merge pull request #1076 from waylife/develop
fix issue #1073. crash on oneplus two(Android 5.1.1, Oxygen 2.0.0).
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | app/src/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 5d630ca06..d83461392 100644 --- 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 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); |