[Android] Disable OpenGL setting until it's fixed

[Alexandre Perraud]

vlc-ports/android | branch: master | Alexandre Perraud <4leyx4ndre at gmail.com> | Fri Mar  6 16:00:16 2015 +0100| [1008bb15c00c3348505f633b14b644a5df648bc6] | committer: Alexandre Perraud

Disable OpenGL setting until it's fixed

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

 vlc-android/res/xml/preferences.xml                     |    8 ++++----
 .../src/org/videolan/vlc/gui/PreferencesActivity.java   |   15 ++++++++-------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/vlc-android/res/xml/preferences.xml b/vlc-android/res/xml/preferences.xml
index 17c6310..a5d3b02 100644
--- a/vlc-android/res/xml/preferences.xml
+++ b/vlc-android/res/xml/preferences.xml
@@ -114,10 +114,10 @@
                     android:key="aout"
                     android:summary="@string/aout_summary"
                     android:title="@string/aout" />
-                <ListPreference
-                    android:key="vout"
-                    android:summary="@string/vout_summary"
-                    android:title="@string/vout" />
+                <!--<ListPreference-->
+                    <!--android:key="vout"-->
+                    <!--android:summary="@string/vout_summary"-->
+                    <!--android:title="@string/vout" />-->
 
                 <Preference
                     android:enabled="true"
diff --git a/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java b/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java
index bd799d2..8b3828c 100644
--- a/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java
@@ -236,13 +236,14 @@ public class PreferencesActivity extends PreferenceActivity implements OnSharedP
             group.removePreference(aoutPref);
         }
         // Video output
-        ListPreference voutPref = (ListPreference) findPreference("vout");
-        int voutEntriesId = LibVlcUtil.isGingerbreadOrLater() ? R.array.vouts : R.array.vouts_froyo;
-        int voutEntriesIdValues = LibVlcUtil.isGingerbreadOrLater() ? R.array.vouts_values : R.array.vouts_values_froyo;
-        voutPref.setEntries(voutEntriesId);
-        voutPref.setEntryValues(voutEntriesIdValues);
-        if (voutPref.getValue() == null)
-            voutPref.setValue("0" /* VOUT_ANDROID_SURFACE */);
+//        FIXME : This setting is disable until OpenGL it's fixed
+//        ListPreference voutPref = (ListPreference) findPreference("vout");
+//        int voutEntriesId = LibVlcUtil.isGingerbreadOrLater() ? R.array.vouts : R.array.vouts_froyo;
+//        int voutEntriesIdValues = LibVlcUtil.isGingerbreadOrLater() ? R.array.vouts_values : R.array.vouts_values_froyo;
+//        voutPref.setEntries(voutEntriesId);
+//        voutPref.setEntryValues(voutEntriesIdValues);
+//        if (voutPref.getValue() == null)
+//            voutPref.setValue("0"  VOUT_ANDROID_SURFACE );
         // Set locale
         EditTextPreference setLocalePref = (EditTextPreference) findPreference("set_locale");
         setLocalePref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {