Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1076 from waylife/develop 

fix issue #1073. crash on oneplus two(Android 5.1.1, Oxygen 2.0.0).
This commit is contained in:
Tom Hennen 2015-08-15 14:58:28 -04:00
parent 773c8626cc 2cd6a54631
commit 269d54d465
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View File

@ -36,8 +36,7 @@
android:label="@string/app_name" android:label="@string/app_name"
android:backupAgent=".core.backup.OpmlBackupAgent" android:backupAgent=".core.backup.OpmlBackupAgent"
android:restoreAnyVersion="true" android:restoreAnyVersion="true"
android:logo="@drawable/ic_launcher" android:logo="@drawable/ic_launcher">
android:theme="@style/Theme.AntennaPod.Light">
<meta-data <meta-data
android:name="com.google.android.backup.api_key" android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAI3a05VToCTlqBymJrbFGaKQMvF-bBAuLsOdavBA"/> android:value="AEdPqrEAAAAI3a05VToCTlqBymJrbFGaKQMvF-bBAuLsOdavBA"/>

2
app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
View File

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