Merge "DisplayColor: Properly handle a minValue" into cm-11.0 (4c9f9b8c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/hardware/DisplayColor.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -232,7 +232,8 @@ public class DisplayColor extends DialogPreference {
		mValue = value;
		mIndex = index;

		mSeekBar.setMax(DisplayColorCalibration.getMaxValue());
		mSeekBar.setMax(DisplayColorCalibration.getMaxValue() -
		DisplayColorCalibration.getMinValue());
		mSeekBar.setOnSeekBarChangeListener(this);
		}

		@@ -242,13 +243,14 @@ public class DisplayColor extends DialogPreference {

		@Override
		public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
		int min = DisplayColorCalibration.getMinValue();
		int max = DisplayColorCalibration.getMaxValue();

		if (fromUser) {
		mCurrentColors[mIndex] = String.valueOf(progress);
		mCurrentColors[mIndex] = String.valueOf(progress + min);
		DisplayColorCalibration.setColors(TextUtils.join(" ", mCurrentColors));
		}

		int min = DisplayColorCalibration.getMinValue();
		int max = DisplayColorCalibration.getMaxValue();
		int percent = Math.round(100F * progress / (max - min));
		mValue.setText(String.format("%d%%", percent));
		}