diff --git a/res/values/seekbarpreference_attr.xml b/res/values/seekbarpreference_attr.xml index e2f64470..14c7c90e 100644 --- a/res/values/seekbarpreference_attr.xml +++ b/res/values/seekbarpreference_attr.xml @@ -2,7 +2,7 @@ - + diff --git a/res/xml/preference_replaygain.xml b/res/xml/preference_replaygain.xml index c036929d..6504e4c8 100644 --- a/res/xml/preference_replaygain.xml +++ b/res/xml/preference_replaygain.xml @@ -43,8 +43,9 @@ THE SOFTWARE. vanilla:sbpMaxValue="150" vanilla:sbpSummaryFormat="%s%+.1fdB" vanilla:sbpSummaryValueAddition="-75" - vanilla:sbpSummaryValueDivider="5" + vanilla:sbpSummaryValueMultiplication="0.2" /> + + vanilla:sbpSummaryValueMultiplication="0.1" /> diff --git a/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java b/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java index 705d1ce5..45963979 100644 --- a/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java +++ b/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java @@ -64,9 +64,9 @@ public class SeekBarPreference extends DialogPreference implements SeekBar.OnSee */ private float mSummaryValueAddition; /** - * Divide summary value by this value + * Multiply summary value by this value */ - private float mSummaryValueDivider; + private float mSummaryValueMultiplication; /** * TextView to display current summary */ @@ -89,7 +89,7 @@ public class SeekBarPreference extends DialogPreference implements SeekBar.OnSee TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.SeekBarPreference); mMaxValue = a.getInteger(R.styleable.SeekBarPreference_sbpMaxValue, 0); - mSummaryValueDivider = a.getFloat(R.styleable.SeekBarPreference_sbpSummaryValueDivider, 0f); + mSummaryValueMultiplication = a.getFloat(R.styleable.SeekBarPreference_sbpSummaryValueMultiplication, 0f); mSummaryValueAddition = a.getFloat(R.styleable.SeekBarPreference_sbpSummaryValueAddition, 0f); mSummaryFormat = a.getString(R.styleable.SeekBarPreference_sbpSummaryFormat); mSummaryFormat = (mSummaryFormat == null ? "%s %.1f" : mSummaryFormat); @@ -128,8 +128,8 @@ public class SeekBarPreference extends DialogPreference implements SeekBar.OnSee if (mSummaryValueAddition != 0f) fValue = fValue + mSummaryValueAddition; - if (mSummaryValueDivider != 0f) - fValue = fValue / mSummaryValueDivider; + if (mSummaryValueMultiplication != 0f) + fValue = fValue * mSummaryValueMultiplication; return String.format(mSummaryFormat, mSummaryText, fValue); }