[Android] Revert "PreferencesActivity: reflect defaults in GUI"

[Edward Wang]

vlc-ports/android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Sat Jun 22 13:57:09 2013 -0400| [9def991f15473bfd7dfb30f79372e5b3d1722992] | committer: Edward Wang

Revert "PreferencesActivity: reflect defaults in GUI"

This reverts commit 5d9ad9eb07e368a99089b50725586d54dd754cbb.

Not needed anymore.

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

 .../src/org/videolan/vlc/gui/PreferencesActivity.java        |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java b/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java
index 923d279..901ed46 100644
--- a/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java
@@ -59,8 +59,6 @@ public class PreferencesActivity extends PreferenceActivity implements OnSharedP
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
-        boolean deblocking_exists = sharedPrefs.contains("enable_deblocking");
         addPreferencesFromResource(R.xml.preferences);
 
         // Directories
@@ -184,11 +182,6 @@ public class PreferencesActivity extends PreferenceActivity implements OnSharedP
             aoutPref.setValue(Util.isGingerbreadOrLater()
                     ? "2"/*AOUT_OPENSLES*/
                             : "0"/*AOUT_AUDIOTRACK_JAVA*/);
-        // Deblocking
-        CheckBoxPreference deblockingPref = (CheckBoxPreference) findPreference("enable_deblocking");
-        if(!deblocking_exists) {
-            deblockingPref.setChecked(Util.deblockingDefault());
-        }
         // Set locale
         EditTextPreference setLocalePref = (EditTextPreference) findPreference("set_locale");
         setLocalePref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@@ -201,6 +194,7 @@ public class PreferencesActivity extends PreferenceActivity implements OnSharedP
         });
 
         /*** SharedPreferences Listener to apply changes ***/
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
         sharedPrefs.registerOnSharedPreferenceChangeListener(this);
     }
 
@@ -210,7 +204,7 @@ public class PreferencesActivity extends PreferenceActivity implements OnSharedP
                 || key.equalsIgnoreCase("subtitles_text_encoding")
                 || key.equalsIgnoreCase("aout")
                 || key.equalsIgnoreCase("enable_time_stretching_audio")
-                || key.equalsIgnoreCase("enable_deblocking")
+                || key.equalsIgnoreCase("deblocking")
                 || key.equalsIgnoreCase("chroma_format")
                 || key.equalsIgnoreCase("enable_verbose_mode")) {
             Util.updateLibVlcSettings(sharedPreferences);