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

Add a flag to control auto-brightness adjustment.

Browse Source 
The feature is still disabled, it's just disabled using
a flag now.

Change-Id: I43ceaa5ab9b7252e3882c8b2d48c9844afb806c3
This commit is contained in:
Jeff Brown
2012-08-21 21:13:48 -07:00
parent c76bfb9243
commit 9674b32324
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,9 @@ import android.widget.SeekBar;
public class BrightnessPreference extends SeekBarDialogPreference implements public class BrightnessPreference extends SeekBarDialogPreference implements
SeekBar.OnSeekBarChangeListener, CheckBox.OnCheckedChangeListener { SeekBar.OnSeekBarChangeListener, CheckBox.OnCheckedChangeListener {
// If true, enables the use of the screen auto-brightness adjustment setting.
private static final boolean USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT = false;
private final int mScreenBrightnessMinimum; private final int mScreenBrightnessMinimum;
private final int mScreenBrightnessMaximum; private final int mScreenBrightnessMaximum;
@@ -114,7 +117,7 @@ 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); mSeekBar.setEnabled(!mAutomaticMode || USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT);
} else { } else {
mSeekBar.setEnabled(true); mSeekBar.setEnabled(true);
} }
@@ -138,14 +141,15 @@ 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); mSeekBar.setEnabled(!mAutomaticMode || USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT);
setBrightness(mSeekBar.getProgress(), false); setBrightness(mSeekBar.getProgress(), false);
} }
private int getBrightness() { private int getBrightness() {
int mode = getBrightnessMode(0); int mode = getBrightnessMode(0);
float brightness = 0; float brightness = 0;
if (false && mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) { if (USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT
&& 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;
@@ -181,7 +185,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); mSeekBar.setEnabled(!checked || USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT);
} }
@Override @Override
@@ -213,7 +217,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
private void setBrightness(int brightness, boolean write) { private void setBrightness(int brightness, boolean write) {
if (mAutomaticMode) { if (mAutomaticMode) {
if (false) { if (USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT) {
float valf = (((float)brightness*2)/SEEK_BAR_RANGE) - 1.0f; float valf = (((float)brightness*2)/SEEK_BAR_RANGE) - 1.0f;
try { try {
IPowerManager power = IPowerManager.Stub.asInterface( IPowerManager power = IPowerManager.Stub.asInterface(