diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-05-04 11:56:08 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-05-04 19:36:07 -0700 |
| commit | a1810eff06acf67b9fae62cb7b58fb31af41318c (patch) | |
| tree | e7b7e7d09b811b8d2adb2e0344f44a6c86a6f273 | |
| parent | 93df8a71f87985a9aa3dc142b430c365e2a53276 (diff) | |
| download | frameworks_base-a1810eff06acf67b9fae62cb7b58fb31af41318c.zip frameworks_base-a1810eff06acf67b9fae62cb7b58fb31af41318c.tar.gz frameworks_base-a1810eff06acf67b9fae62cb7b58fb31af41318c.tar.bz2 | |
power: Add panel auto-brightness configuration
* Some panel hardware requires that we twiddle some knobs in sysfs to
enable proper display calibration (gamma, etc) when auto-brightness
is enabled. Add a configuration value to handle this.
Change-Id: I3c793c3520fc6f9a18d5a3abf1fe0df803c5e580
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 3 | ||||
| -rw-r--r-- | services/java/com/android/server/power/AutoBrightnessHandler.java | 72 | ||||
| -rw-r--r-- | services/java/com/android/server/power/PowerManagerService.java | 9 |
4 files changed, 88 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index e5436bd..38bb52f 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1129,4 +1129,8 @@ <!-- Boolean to enable Stylus gestures --> <bool name="config_stylusGestures">false</bool> + + <!-- Integer to configure panel auto brightness mode when changed --> + <integer name="config_panelAutoBrightnessValue">-1</integer> + </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index e9e8c29..8de9b89 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1934,6 +1934,9 @@ <java-symbol type="bool" name="config_stylusGestures" /> <java-symbol type="string" name="stylus_app_not_installed" /> + <!-- Panel auto brightness --> + <java-symbol type="integer" name="config_panelAutoBrightnessValue" /> + <!-- Options that show upon long-pressing a key on the physical keyboard --> <java-symbol type="string" name="symbol_picker_0" /> <java-symbol type="string" name="symbol_picker_1" /> diff --git a/services/java/com/android/server/power/AutoBrightnessHandler.java b/services/java/com/android/server/power/AutoBrightnessHandler.java new file mode 100644 index 0000000..c077317 --- /dev/null +++ b/services/java/com/android/server/power/AutoBrightnessHandler.java @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2013 The CyanogenMod Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.server.power; + +import android.content.Context; +import android.os.SystemProperties; +import android.provider.Settings; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; + +/** + * Certain display devices require that we set a special mode when enabling auto-brightness. + * This is done by setting a sysfs node. This behavior can be configured by setting the + * config_panelAutoBrightnessValue to the integer value to write when enabled. + * + * Some high-end panels might support alternative brightness modes such as high gamma. This + * is highly device-specific, but we will support these via a persistent system property. + * + * @hide + */ +public class AutoBrightnessHandler { + + private static final String NODE = "/sys/class/lcd/panel/panel/auto_brightness"; + + private static final String ALT_BRIGHTNESS_PROP = "persist.sys.alt.brightness"; + + private static final int PANEL_MANUAL = 0; + + private final int mPanelAutoValue; + + public AutoBrightnessHandler(Context context) { + mPanelAutoValue = context.getResources().getInteger( + com.android.internal.R.integer.config_panelAutoBrightnessValue); + } + + public void onAutoBrightnessChanged(int mode) { + if (mPanelAutoValue > -1) { + int override = SystemProperties.getInt(ALT_BRIGHTNESS_PROP, -1); + writeValue(NODE, mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC ? + (override > -1 ? override : mPanelAutoValue) : PANEL_MANUAL); + } + } + + private static void writeValue(String filename, int value) { + try { + FileOutputStream fos = new FileOutputStream(new File(filename)); + fos.write(String.valueOf(value).getBytes()); + fos.flush(); + fos.close(); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } +} diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java index e8f6b60..f1971c4 100644 --- a/services/java/com/android/server/power/PowerManagerService.java +++ b/services/java/com/android/server/power/PowerManagerService.java @@ -183,6 +183,7 @@ public final class PowerManagerService extends IPowerManager.Stub private WirelessChargerDetector mWirelessChargerDetector; private SettingsObserver mSettingsObserver; private DreamManagerService mDreamManager; + private AutoBrightnessHandler mAutoBrightnessHandler; private LightsService.Light mAttentionLight; private LightsService.Light mButtonsLight; private LightsService.Light mKeyboardLight; @@ -418,6 +419,9 @@ public final class PowerManagerService extends IPowerManager.Stub // activity manager is not running when the constructor is called, so we // have to defer setting the screen state until this point. mDisplayBlanker.unblankAllDisplays(); + + mAutoBrightnessHandler = new AutoBrightnessHandler(context); + } public void setPolicy(WindowManagerPolicy policy) { @@ -567,9 +571,14 @@ public final class PowerManagerService extends IPowerManager.Stub mTemporaryScreenAutoBrightnessAdjustmentSettingOverride = Float.NaN; } + final int oldScreenBrightnessModeSetting = + mScreenBrightnessModeSetting; mScreenBrightnessModeSetting = Settings.System.getIntForUser(resolver, Settings.System.SCREEN_BRIGHTNESS_MODE, Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL, UserHandle.USER_CURRENT); + if (oldScreenBrightnessModeSetting != mScreenBrightnessModeSetting) { + mAutoBrightnessHandler.onAutoBrightnessChanged(mScreenBrightnessModeSetting); + } mDirty |= DIRTY_SETTINGS; } |
