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

Merge "Fix manual brightness adjustment." into jb-dev

Browse Source
This commit is contained in:
Jeff Brown
2012-04-30 16:49:26 -07:00
committed by Android (Google) Code Review
parent 31a84c881c 829c79961c
commit 1d1cd10a2a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,8 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
getContext().getResources().getInteger(com.android.internal.R.integer.config_screenBrightnessDim); 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 static final int SEEK_BAR_RANGE = 10000;
private ContentObserver mBrightnessObserver = new ContentObserver(new Handler()) { private ContentObserver mBrightnessObserver = new ContentObserver(new Handler()) {
@Override @Override
public void onChange(boolean selfChange) { public void onChange(boolean selfChange) {
@@ -98,7 +100,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
super.onBindDialogView(view); super.onBindDialogView(view);
mSeekBar = getSeekBar(view); mSeekBar = getSeekBar(view);
mSeekBar.setMax(10000); mSeekBar.setMax(SEEK_BAR_RANGE);
mOldBrightness = getBrightness(); mOldBrightness = getBrightness();
mSeekBar.setProgress(mOldBrightness); mSeekBar.setProgress(mOldBrightness);
@@ -141,11 +143,10 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
} else { } else {
brightness = Settings.System.getInt(getContext().getContentResolver(), brightness = Settings.System.getInt(getContext().getContentResolver(),
Settings.System.SCREEN_BRIGHTNESS, 100); Settings.System.SCREEN_BRIGHTNESS, 100);
brightness = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim) brightness = (brightness - mScreenBrightnessDim)
/ (brightness - mScreenBrightnessDim); / (MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
} }
return (int)(brightness*10000); return (int)(brightness*SEEK_BAR_RANGE);
} }
private int getBrightnessMode(int defaultValue) { private int getBrightnessMode(int defaultValue) {
@@ -197,7 +198,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) {
float valf = (((float)brightness*2)/10000) - 1.0f; float valf = (((float)brightness*2)/SEEK_BAR_RANGE) - 1.0f;
try { try {
IPowerManager power = IPowerManager.Stub.asInterface( IPowerManager power = IPowerManager.Stub.asInterface(
ServiceManager.getService("power")); ServiceManager.getService("power"));
@@ -213,7 +214,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
} }
} else { } else {
int range = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim); int range = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
brightness = (brightness*range)/10000 + mScreenBrightnessDim; brightness = (brightness*range)/SEEK_BAR_RANGE + mScreenBrightnessDim;
try { try {
IPowerManager power = IPowerManager.Stub.asInterface( IPowerManager power = IPowerManager.Stub.asInterface(
ServiceManager.getService("power")); ServiceManager.getService("power"));