[Android] Secondary display : Enable hardware acceleration by default

[Alexandre Perraud]

vlc-ports/android | branch: master | Alexandre Perraud <4leyx4ndre at gmail.com> | Thu Sep  4 12:12:38 2014 +0200| [c29cf59a837cda0735d82b11c9ddc2e762f5111a] | committer: Jean-Baptiste Kempf

Secondary display : Enable hardware acceleration by default

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=c29cf59a837cda0735d82b11c9ddc2e762f5111a
---

 vlc-android/res/values/strings.xml                               |    2 --
 vlc-android/res/xml/preferences.xml                              |    5 -----
 .../src/org/videolan/vlc/gui/video/VideoPlayerActivity.java      |    6 ------
 3 files changed, 13 deletions(-)

diff --git a/vlc-android/res/values/strings.xml b/vlc-android/res/values/strings.xml
index 7ac8601..ed70538 100644
--- a/vlc-android/res/values/strings.xml
+++ b/vlc-android/res/values/strings.xml
@@ -222,8 +222,6 @@
     <string name="interface_prefs_screen">Interface</string>
     <string name="interface_secondary_display_category">Interface - Secondary Display</string>
     <string name="interface_secondary_display_category_summary">Settings when secondary displays are connected (HDMI/Miracast).</string>
-    <string name="enable_secondary_display_hardware_acceleration">Keep hardware acceleration setting</string>
-    <string name="enable_secondary_display_hardware_acceleration_summary">Hardware acceleration might not work</string>
     <string name="enable_clone_mode">Prefer clone</string>
     <string name="enable_clone_mode_summary">Clone the device screen without remote control.</string>
     <string name="interface_other_category">Interface - Other</string>
diff --git a/vlc-android/res/xml/preferences.xml b/vlc-android/res/xml/preferences.xml
index 3c0546a..6e3654c 100644
--- a/vlc-android/res/xml/preferences.xml
+++ b/vlc-android/res/xml/preferences.xml
@@ -45,11 +45,6 @@
                     android:key="enable_clone_mode"
                     android:summary="@string/enable_clone_mode_summary"
                     android:title="@string/enable_clone_mode" />
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:key="enable_secondary_display_hardware_acceleration"
-                    android:summary="@string/enable_secondary_display_hardware_acceleration_summary"
-                    android:title="@string/enable_secondary_display_hardware_acceleration" />
             </PreferenceCategory>
             <PreferenceCategory android:title="@string/interface_other_category" >
                 <CheckBoxPreference
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index 230d481..ecd28ce 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -387,12 +387,6 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
         filter.addAction(VLCApplication.SLEEP_INTENT);
         registerReceiver(mReceiver, filter);
 
-        if (mPresentation != null && !mSettings.getBoolean("enable_secondary_display_hardware_acceleration", false)) {
-            mDisabledHardwareAcceleration = true;
-            mPreviousHardwareAccelerationMode = mLibVLC.getHardwareAcceleration();
-            mLibVLC.setHardwareAcceleration(LibVLC.HW_ACCELERATION_DISABLED);
-            Log.d(TAG, "Secondary Display: Hardware acceleration disabled");
-        }
         Log.d(TAG,
                 "Hardware acceleration mode: "
                         + Integer.toString(mLibVLC.getHardwareAcceleration()));