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

am 296f2d27: am a94320e3: Settings use minimum manual brightness from config

Browse Source 
* commit '296f2d270f23b27446d1d85450ac0310eb9fd3ea':
  Settings use minimum manual brightness from config
This commit is contained in:
Todd Poynor
2011-10-26 14:54:14 +00:00
committed by Android Git Automerger
parent 24491bbc7c 296f2d270f
commit f97709ca95
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,8 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
// Backlight range is from 0 - 255. Need to make sure that user // Backlight range is from 0 - 255. Need to make sure that user
// doesn't set the backlight to 0 and get stuck // doesn't set the backlight to 0 and get stuck
private static final int MINIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_DIM + 10; private int mScreenBrightnessDim =
getContext().getResources().getInteger(com.android.internal.R.integer.config_screenBrightnessDim);
private static final int MAXIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_ON; private static final int MAXIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_ON;
private ContentObserver mBrightnessObserver = new ContentObserver(new Handler()) { private ContentObserver mBrightnessObserver = new ContentObserver(new Handler()) {
@@ -96,9 +97,9 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
super.onBindDialogView(view); super.onBindDialogView(view);
mSeekBar = getSeekBar(view); mSeekBar = getSeekBar(view);
mSeekBar.setMax(MAXIMUM_BACKLIGHT - MINIMUM_BACKLIGHT); mSeekBar.setMax(MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
mOldBrightness = getBrightness(0); mOldBrightness = getBrightness(0);
mSeekBar.setProgress(mOldBrightness - MINIMUM_BACKLIGHT); mSeekBar.setProgress(mOldBrightness - mScreenBrightnessDim);
mCheckBox = (CheckBox)view.findViewById(R.id.automatic_mode); mCheckBox = (CheckBox)view.findViewById(R.id.automatic_mode);
if (mAutomaticAvailable) { if (mAutomaticAvailable) {
@@ -113,7 +114,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
public void onProgressChanged(SeekBar seekBar, int progress, public void onProgressChanged(SeekBar seekBar, int progress,
boolean fromTouch) { boolean fromTouch) {
setBrightness(progress + MINIMUM_BACKLIGHT); setBrightness(progress + mScreenBrightnessDim);
} }
public void onStartTrackingTouch(SeekBar seekBar) { public void onStartTrackingTouch(SeekBar seekBar) {
@@ -128,7 +129,7 @@ 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);
if (!isChecked) { if (!isChecked) {
setBrightness(mSeekBar.getProgress() + MINIMUM_BACKLIGHT); setBrightness(mSeekBar.getProgress() + mScreenBrightnessDim);
} }
} }
@@ -154,7 +155,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
private void onBrightnessChanged() { private void onBrightnessChanged() {
int brightness = getBrightness(MAXIMUM_BACKLIGHT); int brightness = getBrightness(MAXIMUM_BACKLIGHT);
mSeekBar.setProgress(brightness - MINIMUM_BACKLIGHT); mSeekBar.setProgress(brightness - mScreenBrightnessDim);
} }
private void onBrightnessModeChanged() { private void onBrightnessModeChanged() {
@@ -171,7 +172,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
if (positiveResult) { if (positiveResult) {
Settings.System.putInt(resolver, Settings.System.putInt(resolver,
Settings.System.SCREEN_BRIGHTNESS, Settings.System.SCREEN_BRIGHTNESS,
mSeekBar.getProgress() + MINIMUM_BACKLIGHT); mSeekBar.getProgress() + mScreenBrightnessDim);
} else { } else {
restoreOldState(); restoreOldState();
} }
@@ -244,7 +245,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
mOldBrightness = myState.oldProgress; mOldBrightness = myState.oldProgress;
mOldAutomatic = myState.oldAutomatic ? 1 : 0; mOldAutomatic = myState.oldAutomatic ? 1 : 0;
setMode(myState.automatic ? 1 : 0); setMode(myState.automatic ? 1 : 0);
setBrightness(myState.progress + MINIMUM_BACKLIGHT); setBrightness(myState.progress + mScreenBrightnessDim);
} }
private static class SavedState extends BaseSavedState { private static class SavedState extends BaseSavedState {