PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove auto-brightness adjustment setting.

Browse Source 
Not yet ready for release.

Change-Id: I4668e890080d63a29aeeeab4daad6a6466ae36af
This commit is contained in:
Dianne Hackborn
2012-05-09 16:32:55 -07:00
parent 87ca70172c
commit 622fc7aa5f
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/android/settings/BrightnessPreference.java
View File

@@ -110,6 +110,9 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
mOldAutomatic = getBrightnessMode(0); mOldAutomatic = getBrightnessMode(0);
mAutomaticMode = mOldAutomatic == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; mAutomaticMode = mOldAutomatic == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
mCheckBox.setChecked(mAutomaticMode); mCheckBox.setChecked(mAutomaticMode);
mSeekBar.setEnabled(!mAutomaticMode);
} else {
mSeekBar.setEnabled(true);
} }
mSeekBar.setOnSeekBarChangeListener(this); mSeekBar.setOnSeekBarChangeListener(this);
} }
@@ -131,12 +134,13 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
setMode(isChecked ? Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC setMode(isChecked ? Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC
: Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL); : Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);
mSeekBar.setProgress(getBrightness()); mSeekBar.setProgress(getBrightness());
mSeekBar.setEnabled(!mAutomaticMode);
} }
private int getBrightness() { private int getBrightness() {
int mode = getBrightnessMode(0); int mode = getBrightnessMode(0);
float brightness = 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(), brightness = Settings.System.getFloat(getContext().getContentResolver(),
Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0); Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0);
brightness = (brightness+1)/2; brightness = (brightness+1)/2;
@@ -168,6 +172,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
== Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
mCheckBox.setChecked(checked); mCheckBox.setChecked(checked);
mSeekBar.setProgress(getBrightness()); mSeekBar.setProgress(getBrightness());
mSeekBar.setEnabled(!checked);
} }
@Override @Override
@@ -198,19 +203,21 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
private void setBrightness(int brightness, boolean write) { private void setBrightness(int brightness, boolean write) {
if (mAutomaticMode) { if (mAutomaticMode) {
float valf = (((float)brightness*2)/SEEK_BAR_RANGE) - 1.0f; if (false) {
try { float valf = (((float)brightness*2)/SEEK_BAR_RANGE) - 1.0f;
IPowerManager power = IPowerManager.Stub.asInterface( try {
ServiceManager.getService("power")); IPowerManager power = IPowerManager.Stub.asInterface(
if (power != null) { ServiceManager.getService("power"));
power.setAutoBrightnessAdjustment(valf); if (power != null) {
power.setAutoBrightnessAdjustment(valf);
}
if (write) {
final ContentResolver resolver = getContext().getContentResolver();
Settings.System.putFloat(resolver,
Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, valf);
}
} catch (RemoteException doe) {
} }
if (write) {
final ContentResolver resolver = getContext().getContentResolver();
Settings.System.putFloat(resolver,
Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, valf);
}
} catch (RemoteException doe) {
} }
} else { } else {
int range = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim); int range = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim);