From e804647a6519a6e23066a552147a27215c5d15bf Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Wed, 29 Mar 2017 09:17:03 +0200
Subject: [PATCH] make exoplayer default player

---
 .../org/schabi/newpipe/detail/VideoItemDetailFragment.java  | 6 +++++-
 app/src/main/res/values/settings_keys.xml                   | 2 +-
 app/src/main/res/values/strings.xml                         | 4 ++--
 app/src/main/res/xml/settings.xml                           | 6 +++---
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
index f1e94ea8e..719a6bdbd 100644
--- a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
@@ -791,7 +791,11 @@ public class VideoItemDetailFragment extends Fragment {
             }
         } else {
             Intent intent;
-            if (PreferenceManager.getDefaultSharedPreferences(activity).getBoolean(activity.getString(R.string.use_exoplayer_key), false)) {
+            boolean useOldPlayer = PreferenceManager
+                    .getDefaultSharedPreferences(activity)
+                    .getBoolean(activity.getString(R.string.use_old_player_key), false)
+                    || (Build.VERSION.SDK_INT < 16);
+            if (!useOldPlayer) {
                 // ExoPlayer
                 if (streamThumbnail != null) ActivityCommunicator.getCommunicator().backgroundPlayerThumbnail = streamThumbnail;
                 intent = new Intent(activity, ExoPlayerActivity.class)
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index bb2823cb9..99dd0f390 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -11,7 +11,7 @@
     <string name="use_external_video_player_key" translatable="false">use_external_video_player</string>
     <string name="use_external_audio_player_key" translatable="false">use_external_audio_player</string>
     <string name="autoplay_through_intent_key" translatable="false">autoplay_through_intent</string>
-    <string name="use_exoplayer_key" translatable="false">use_exoplayer</string>
+    <string name="use_old_player_key" translatable="false">use_oldplayer</string>
 
     <string name="default_resolution_key" translatable="false">default_resolution_preference</string>
     <string name="default_resolution_value" translatable="false">360p</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 13ca6c2bc..9e992ec18 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -152,8 +152,8 @@
     <string name="error_querying_decoders">Unable to query device decoders</string>
     <string name="error_instantiating_decoder">Unable to instantiate decoder <xliff:g id="decoder_name">%1$s</xliff:g></string>
     <string name="storage_permission_denied">Permission to access storage was denied</string>
-    <string name="use_exoplayer_title">Use ExoPlayer</string>
-    <string name="use_exoplayer_summary">Experimental</string>
+    <string name="use_old_player_title">Use old player</string>
+    <string name="use_old_player_summary">Old build in Mediaframework player.</string>
     <string name="videos">videos</string>
     <string name="subscriber">subscriber</string>
     <string name="subscribe">Subscribe</string>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 7330643ee..88dc06e10 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -34,9 +34,9 @@
             android:defaultValue="@string/default_audio_format_value"/>
 
         <CheckBoxPreference
-            android:key="@string/use_exoplayer_key"
-            android:title="@string/use_exoplayer_title"
-            android:summary="@string/use_exoplayer_summary"
+            android:key="@string/use_old_player_key"
+            android:title="@string/use_old_player_title"
+            android:summary="@string/use_old_player_summary"
             android:defaultValue="false"/>
     </PreferenceCategory>
     <PreferenceCategory