Jon West | eb45d5e | 2019-03-17 16:58:43 -0400 | [diff] [blame] | 1 | From 6fb8a9da588b864630a72bffd2d45c27aeb1cc56 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ricardo Cerqueira <cyanogenmod@cerqueira.org> |
| 3 | Date: Fri, 23 Nov 2012 14:23:16 +0000 |
| 4 | Subject: [PATCH 17/27] Reintroduce button-backlight (and respective inactivity |
| 5 | timeout) |
| 6 | |
| 7 | The power manager rewrite from Change I1d7a52e98f0449f76d70bf421f6a7f245957d1d7 |
| 8 | completely removed support for control of the button backlights, which makes |
| 9 | all capacitive buttons out there stay dark. The commit message in that change |
| 10 | mentions it hasn't been implemented _yet_, so this fix should be temporary |
| 11 | until upstream does their own implementation |
| 12 | |
| 13 | [RC: Updated to 5.0] |
| 14 | |
| 15 | Change-Id: I6094c446e0b8c23f57d30652a3cbd35dee5e821a |
| 16 | |
| 17 | Conflicts: |
| 18 | services/core/java/com/android/server/power/PowerManagerService.java |
| 19 | --- |
| 20 | .../android/server/power/PowerManagerService.java | 13 +++++++++++++ |
| 21 | 1 file changed, 13 insertions(+) |
| 22 | |
| 23 | diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java |
| 24 | index eaaa77600bc..e85d8adf21b 100644 |
| 25 | --- a/services/core/java/com/android/server/power/PowerManagerService.java |
| 26 | +++ b/services/core/java/com/android/server/power/PowerManagerService.java |
| 27 | @@ -233,6 +233,12 @@ public final class PowerManagerService extends SystemService |
| 28 | |
| 29 | private static final float PROXIMITY_NEAR_THRESHOLD = 5.0f; |
| 30 | |
| 31 | + // Add button light timeout |
| 32 | + private static final int BUTTON_ON_DURATION = 5 * 1000; |
| 33 | + |
| 34 | + // File location for last reboot reason |
| 35 | + private static final String LAST_REBOOT_LOCATION = "/data/misc/reboot/last_reboot_reason"; |
| 36 | + |
| 37 | private final Context mContext; |
| 38 | private final ServiceThread mHandlerThread; |
| 39 | private final PowerManagerHandler mHandler; |
| 40 | @@ -2076,6 +2082,7 @@ public final class PowerManagerService extends SystemService |
| 41 | final long screenOffTimeout = getScreenOffTimeoutLocked(sleepTimeout); |
| 42 | final long screenDimDuration = getScreenDimDurationLocked(screenOffTimeout); |
| 43 | final boolean userInactiveOverride = mUserInactiveOverrideFromWindowManager; |
| 44 | + final int screenBrightness = mScreenBrightnessSettingDefault; |
| 45 | final long nextProfileTimeout = getNextProfileTimeoutLocked(now); |
| 46 | |
| 47 | mUserActivitySummary = 0; |
| 48 | @@ -2083,6 +2090,12 @@ public final class PowerManagerService extends SystemService |
| 49 | nextTimeout = mLastUserActivityTime |
| 50 | + screenOffTimeout - screenDimDuration; |
| 51 | if (now < nextTimeout) { |
| 52 | + if (now > mLastUserActivityTime + BUTTON_ON_DURATION) { |
| 53 | + mButtonsLight.setBrightness(0); |
| 54 | + } else { |
| 55 | + mButtonsLight.setBrightness(screenBrightness); |
| 56 | + nextTimeout = now + BUTTON_ON_DURATION; |
| 57 | + } |
| 58 | mUserActivitySummary = USER_ACTIVITY_SCREEN_BRIGHT; |
| 59 | if (mWakefulness == WAKEFULNESS_AWAKE) { |
| 60 | int buttonBrightness; |
| 61 | -- |
| 62 | 2.17.1 |
| 63 | |