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

Merge "ui: Only set brightness when needed."

Browse Source
This commit is contained in:
Tao Bao
2018-08-16 20:10:26 +00:00
committed by Gerrit Code Review
parent d460afe963 53be332711
commit cf01f7dcbe
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui.cpp
+3 -4
View File
@@ -454,8 +454,7 @@ int RecoveryUI::WaitKey() {
return static_cast<int>(KeyError::INTERRUPTED); return static_cast<int>(KeyError::INTERRUPTED);
} }
// Time out after UI_WAIT_KEY_TIMEOUT_SEC, unless a USB cable is // Time out after UI_WAIT_KEY_TIMEOUT_SEC, unless a USB cable is plugged in.
// plugged in.
do { do {
bool rc = key_queue_cond.wait_for(lk, std::chrono::seconds(UI_WAIT_KEY_TIMEOUT_SEC), [this] { bool rc = key_queue_cond.wait_for(lk, std::chrono::seconds(UI_WAIT_KEY_TIMEOUT_SEC), [this] {
return this->key_queue_len != 0 || key_interrupted_; return this->key_queue_len != 0 || key_interrupted_;
@@ -466,13 +465,13 @@ int RecoveryUI::WaitKey() {
} }
if (screensaver_state_ != ScreensaverState::DISABLED) { if (screensaver_state_ != ScreensaverState::DISABLED) {
if (!rc) { if (!rc) {
// Lower the brightness level: NORMAL -> DIMMED; DIMMED -> OFF. // Must be after a timeout. Lower the brightness level: NORMAL -> DIMMED; DIMMED -> OFF.
if (screensaver_state_ == ScreensaverState::NORMAL) { if (screensaver_state_ == ScreensaverState::NORMAL) {
SetScreensaverState(ScreensaverState::DIMMED); SetScreensaverState(ScreensaverState::DIMMED);
} else if (screensaver_state_ == ScreensaverState::DIMMED) { } else if (screensaver_state_ == ScreensaverState::DIMMED) {
SetScreensaverState(ScreensaverState::OFF); SetScreensaverState(ScreensaverState::OFF);
} }
} else { } else if (screensaver_state_ != ScreensaverState::NORMAL) {
// Drop the first key if it's changing from OFF to NORMAL. // Drop the first key if it's changing from OFF to NORMAL.
if (screensaver_state_ == ScreensaverState::OFF) { if (screensaver_state_ == ScreensaverState::OFF) {
if (key_queue_len > 0) { if (key_queue_len > 0) {