From 332cbe3c3b94eb5c3249be0330d6620c0a70dd00 Mon Sep 17 00:00:00 2001 From: Peter Osterlund Date: Sat, 19 Dec 2015 23:48:19 +0100 Subject: [PATCH] DroidFish: Use PreferenceFragment to display preferences. --- .../org/petero/droidfish/SeekBarPreference.java | 2 +- .../petero/droidfish/activities/Preferences.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/DroidFish/src/org/petero/droidfish/SeekBarPreference.java b/DroidFish/src/org/petero/droidfish/SeekBarPreference.java index 9122804..ec31b54 100644 --- a/DroidFish/src/org/petero/droidfish/SeekBarPreference.java +++ b/DroidFish/src/org/petero/droidfish/SeekBarPreference.java @@ -94,7 +94,7 @@ public class SeekBarPreference extends Preference bar.setMax(maxValue); bar.setProgress(currVal); bar.setOnSeekBarChangeListener(this); - lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT, + lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); lp.gravity = Gravity.RIGHT; bar.setLayoutParams(lp); diff --git a/DroidFish/src/org/petero/droidfish/activities/Preferences.java b/DroidFish/src/org/petero/droidfish/activities/Preferences.java index ff3b84d..f4fa14c 100644 --- a/DroidFish/src/org/petero/droidfish/activities/Preferences.java +++ b/DroidFish/src/org/petero/droidfish/activities/Preferences.java @@ -24,15 +24,25 @@ import org.petero.droidfish.Util; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceActivity; +import android.preference.PreferenceFragment; import android.preference.PreferenceManager; public class Preferences extends PreferenceActivity { + public static class Fragment extends PreferenceFragment { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.preferences); + } + } + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.preferences); - + getFragmentManager().beginTransaction() + .replace(android.R.id.content, new Fragment()) + .commit(); SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this); Util.setFullScreenMode(this, settings); }