[Android] res: Change loop filter to an integer list

[Edward Wang]

vlc-ports/android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Sat Jun 22 13:55:37 2013 -0400| [6af7766f3a29b2c257374040900be62a88b7fa9c] | committer: Edward Wang

res: Change loop filter to an integer list

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

 vlc-android/res/values/strings.xml  |   17 ++++++++++++++++-
 vlc-android/res/xml/preferences.xml |   11 +++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/vlc-android/res/values/strings.xml b/vlc-android/res/values/strings.xml
index 926aa52..484eb4d 100644
--- a/vlc-android/res/values/strings.xml
+++ b/vlc-android/res/values/strings.xml
@@ -191,7 +191,7 @@
     <string name="enable_iomx_summary">Improves performance, but may not work with all devices.</string>
     <string name="enable_time_stretching_audio">Time-stretching audio</string>
     <string name="enable_time_stretching_audio_summary">Speed up and slow down audio without changing the pitch (requires a fast device).</string>
-    <string name="enable_deblocking">Deblocking (loop) filter</string>
+    <string name="enable_deblocking">Deblocking filter settings</string>
     <string name="enable_deblocking_summary">Improves video quality but requires a fast device</string>
     <string name="other_prefs_category">Other</string>
     <string name="clear_history">Clear search history</string>
@@ -220,6 +220,21 @@
     <string name="set_locale_popup">Quit and reset VLC for changes to take effect.</string>
     <string name="quit">Quit application</string>
 
+    <string-array name="deblocking_list">
+        <item>Automatic</item>
+        <item>Always deblock (0)</item>
+        <item>Skip for non-ref (1)</item>
+        <item>Skip for non-key (3)</item>
+        <item>Skip for all (4)</item>
+    </string-array>
+    <string-array name="deblocking_values" translatable="false">
+        <item>-1</item>
+        <item>0</item>
+        <item>1</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+
     <string-array name="screen_orientation_list">
         <item>@string/screen_orientation_sensor</item>
         <item>@string/screen_orientation_start_lock</item>
diff --git a/vlc-android/res/xml/preferences.xml b/vlc-android/res/xml/preferences.xml
index 301f418..c695a95 100644
--- a/vlc-android/res/xml/preferences.xml
+++ b/vlc-android/res/xml/preferences.xml
@@ -45,15 +45,18 @@
             android:key="chroma_format"
             android:summary="@string/chroma_format_summary"
             android:title="@string/chroma_format" />
+        <ListPreference
+            android:defaultValue="-1"
+            android:entries="@array/deblocking_list"
+            android:entryValues="@array/deblocking_values"
+            android:key="deblocking"
+            android:title="@string/enable_deblocking"
+            android:summary="@string/enable_deblocking_summary" />
         <CheckBoxPreference
             android:key="enable_iomx"
             android:summary="@string/enable_iomx_summary"
             android:title="@string/enable_iomx" />
         <CheckBoxPreference
-            android:key="enable_deblocking"
-            android:summary="@string/enable_deblocking_summary"
-            android:title="@string/enable_deblocking" />
-        <CheckBoxPreference
             android:defaultValue="false"
             android:key="enable_time_stretching_audio"
             android:summary="@string/enable_time_stretching_audio_summary"