Remove auto-brightness adjustment setting. (622fc7aa) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/BrightnessPreference.java

+20 −13

Original line number	Diff line number	Diff line
		@@ -110,6 +110,9 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
		mOldAutomatic = getBrightnessMode(0);
		mAutomaticMode = mOldAutomatic == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
		mCheckBox.setChecked(mAutomaticMode);
		mSeekBar.setEnabled(!mAutomaticMode);
		} else {
		mSeekBar.setEnabled(true);
		}
		mSeekBar.setOnSeekBarChangeListener(this);
		}
		@@ -131,12 +134,13 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
		setMode(isChecked ? Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC
		: Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);
		mSeekBar.setProgress(getBrightness());
		mSeekBar.setEnabled(!mAutomaticMode);
		}

		private int getBrightness() {
		int mode = getBrightnessMode(0);
		float brightness = 0;
		if (mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
		if (false && mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
		brightness = Settings.System.getFloat(getContext().getContentResolver(),
		Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0);
		brightness = (brightness+1)/2;
		@@ -168,6 +172,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
		== Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
		mCheckBox.setChecked(checked);
		mSeekBar.setProgress(getBrightness());
		mSeekBar.setEnabled(!checked);
		}

		@Override
		@@ -198,6 +203,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements

		private void setBrightness(int brightness, boolean write) {
		if (mAutomaticMode) {
		if (false) {
		float valf = (((float)brightness*2)/SEEK_BAR_RANGE) - 1.0f;
		try {
		IPowerManager power = IPowerManager.Stub.asInterface(
		@@ -212,6 +218,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
		}
		} catch (RemoteException doe) {
		}
		}
		} else {
		int range = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
		brightness = (brightness*range)/SEEK_BAR_RANGE + mScreenBrightnessDim;