diff options
author | Danny Baumann <dannybaumann@web.de> | 2014-07-08 11:11:16 +0200 |
---|---|---|
committer | Danny Baumann <dannybaumann@web.de> | 2014-07-09 12:24:36 +0200 |
commit | 22aecd384c4ec60c8c663540875beede462d40b7 (patch) | |
tree | 16dd54926546c28b14c2df4d7ae4dfdadbe99445 /src/org/cyanogenmod/wallpapers/photophase/preferences/SeekBarProgressPreference.java | |
parent | c012ca5b623e96a1e545d499ed43b3f649ba136f (diff) | |
download | android_packages_wallpapers_PhotoPhase-22aecd384c4ec60c8c663540875beede462d40b7.tar.gz android_packages_wallpapers_PhotoPhase-22aecd384c4ec60c8c663540875beede462d40b7.tar.bz2 android_packages_wallpapers_PhotoPhase-22aecd384c4ec60c8c663540875beede462d40b7.zip |
Improve preference summary strings.
Remove some redundant summaries (e.g. for interval sliders) and make
summaries of list preferences adapt to the respective selection.
Change-Id: Ie120125fd36aef9b609326eb2d0e65224b7973d3
Diffstat (limited to 'src/org/cyanogenmod/wallpapers/photophase/preferences/SeekBarProgressPreference.java')
-rw-r--r-- | src/org/cyanogenmod/wallpapers/photophase/preferences/SeekBarProgressPreference.java | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/SeekBarProgressPreference.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/SeekBarProgressPreference.java index d1411a7..3f1de6f 100644 --- a/src/org/cyanogenmod/wallpapers/photophase/preferences/SeekBarProgressPreference.java +++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/SeekBarProgressPreference.java @@ -20,6 +20,7 @@ package org.cyanogenmod.wallpapers.photophase.preferences; import android.content.Context; import android.util.AttributeSet; import android.view.View; +import android.widget.SeekBar; import android.widget.TextView; import org.cyanogenmod.wallpapers.photophase.R; @@ -96,7 +97,7 @@ public class SeekBarProgressPreference extends SeekBarPreference { protected void onBindView(View view) { super.onBindView(view); mTextView = (TextView) view.findViewById(R.id.text); - setText(); + setText(getProgress()); } /** @@ -108,18 +109,37 @@ public class SeekBarProgressPreference extends SeekBarPreference { @Override protected void setProgress(int progress, boolean notifyChanged) { super.setProgress(progress, notifyChanged); - setText(); + setText(progress); + } + + /** + * {@inheritDoc} + */ + @Override + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + super.onProgressChanged(seekBar, progress, fromUser); + if (fromUser) { + setText(progress); + syncProgress(seekBar); + } + } + + /** + * {@inheritDoc} + */ + @Override + public void onStopTrackingTouch(SeekBar seekBar) { + super.onStopTrackingTouch(seekBar); + setText(getProgress()); } /** * Method that displays the progress value */ - private void setText() { + private void setText(int progress) { if (mTextView != null) { - String value = String.valueOf(getProgress()); - if (mOnDisplayProgress != null) { - value = mOnDisplayProgress.onDisplayProgress(getProgress()); - } + String value = mOnDisplayProgress != null + ? mOnDisplayProgress.onDisplayProgress(progress) : String.valueOf(progress); mTextView.setText(String.format(mFormat, value)); } } |