merge separate-activities

1 files changed, 4 insertions, 6 deletions

diff --git a/src/org/fox/ttrss/PreferencesActivity.java b/src/org/fox/ttrss/PreferencesActivity.java
index 017888f9..5a7a28fb 100644
--- a/src/org/fox/ttrss/PreferencesActivity.java
+++ b/src/org/fox/ttrss/PreferencesActivity.java
@@ -1,16 +1,14 @@
 package org.fox.ttrss;

 

 import android.content.SharedPreferences;

-import android.content.res.Configuration;

 import android.os.Bundle;

 import android.preference.Preference;

-import android.preference.Preference.OnPreferenceClickListener;

 import android.preference.PreferenceActivity;

-import android.preference.PreferenceCategory;

 import android.preference.PreferenceManager;

 

 public class PreferencesActivity extends PreferenceActivity {

 

+	@SuppressWarnings("deprecation")

 	@Override

 	protected void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

@@ -19,15 +17,15 @@ public class PreferencesActivity extends PreferenceActivity {
 				.getDefaultSharedPreferences(getApplicationContext());

 		

 		addPreferencesFromResource(R.xml.preferences);

-		

+

 		findPreference("justify_article_text").setEnabled(!prefs.getBoolean("combined_mode", false));

 		

-		findPreference("combined_mode").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {			

+		/* findPreference("combined_mode").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {			

 			@Override

 			public boolean onPreferenceChange(Preference preference, Object newValue) {				

 				findPreference("justify_article_text").setEnabled(!newValue.toString().equals("true"));				

 				return true;

 			}

-		});

+		}); */

 	}

 }