Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keyboard Backlight for D4 set to screen brightness #3

Open
wants to merge 2 commits into
base: cm-10.1
Choose a base branch
from
+13 −0
Open

Keyboard Backlight for D4 set to screen brightness #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
696dc13
Keyboard Backlight for D4 set to screen brightness
jsnweitzel Jan 7, 2013
7de1381
Merge git://github.com/STS-Dev-Team/android_frameworks_base into cm-10.1
jsnweitzel Jan 7, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions services/java/com/android/server/power/DisplayPowerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,7 @@ private void setScreenOn(boolean on) {
mNotifier.onScreenOn();
} else {
mLights.getLight(LightsService.LIGHT_ID_BUTTONS).setBrightness(0);
mLights.getLight(LightsService.LIGHT_ID_KEYBOARD).setBrightness(0);
mNotifier.onScreenOff();
}
}
Expand Down
12 changes: 12 additions & 0 deletions services/java/com/android/server/power/PowerManagerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.database.ContentObserver;
import android.net.Uri;
Expand Down Expand Up @@ -147,6 +148,7 @@ public final class PowerManagerService extends IPowerManager.Stub
// minimum screen off timeout should be longer than this.
private static final int SCREEN_DIM_DURATION = 7 * 1000;
private static final int BUTTON_ON_DURATION = 5 * 1000;
private static final int KEYBOARD_ON_DURATION = 9 * 1000;

// The maximum screen dim time expressed as a ratio relative to the screen
// off timeout. If the screen off timeout is very short then we want the
Expand Down Expand Up @@ -187,6 +189,7 @@ public final class PowerManagerService extends IPowerManager.Stub
private DreamManagerService mDreamManager;
private LightsService.Light mAttentionLight;
private LightsService.Light mButtonsLight;
private LightsService.Light mKeyboardLight;

private final Object mLock = new Object();

Expand Down Expand Up @@ -444,6 +447,7 @@ public void systemReady(TwilightService twilight, DreamManagerService dreamManag
mSettingsObserver = new SettingsObserver(mHandler);
mAttentionLight = mLightsService.getLight(LightsService.LIGHT_ID_ATTENTION);
mButtonsLight = mLightsService.getLight(LightsService.LIGHT_ID_BUTTONS);
mKeyboardLight = mLightsService.getLight(LightsService.LIGHT_ID_KEYBOARD);

// Register for broadcasts from other components of the system.
IntentFilter filter = new IntentFilter();
Expand Down Expand Up @@ -1303,6 +1307,14 @@ private void updateUserActivitySummaryLocked(long now, int dirty) {
mButtonsLight.setBrightness(mDisplayPowerRequest.screenBrightness);
nextTimeout = now + BUTTON_ON_DURATION;
}
if (now > mLastUserActivityTime + KEYBOARD_ON_DURATION) {
mKeyboardLight.setBrightness(0);
} else if (mContext.getResources().getConfiguration().hardKeyboardHidden != Configuration.HARDKEYBOARDHIDDEN_YES){
mKeyboardLight.setBrightness(mDisplayPowerRequest.screenBrightness);
nextTimeout = now + KEYBOARD_ON_DURATION;
} else if (mContext.getResources().getConfiguration().hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_YES){
mKeyboardLight.setBrightness(0);
}
mUserActivitySummary |= USER_ACTIVITY_SCREEN_BRIGHT;
} else {
nextTimeout = mLastUserActivityTime + screenOffTimeout;
Expand Down