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

Merge "recovery: Porting screensave mode for new platform." am: 15e376d792

Browse Source 
am: 470b4fef7f

Change-Id: I30b84b2cd5071842493f5900a3485cd4f5bc9769
This commit is contained in:
Tao Bao
2018-02-16 05:21:53 +00:00
committed by android-build-merger
parent f6cd6b9e85 470b4fef7f
commit 78997a2af5
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui.cpp
+17 -6
View File
@@ -48,10 +48,16 @@
static constexpr int UI_WAIT_KEY_TIMEOUT_SEC = 120; static constexpr int UI_WAIT_KEY_TIMEOUT_SEC = 120;
static constexpr const char* BRIGHTNESS_FILE = "/sys/class/leds/lcd-backlight/brightness"; static constexpr const char* BRIGHTNESS_FILE = "/sys/class/leds/lcd-backlight/brightness";
static constexpr const char* MAX_BRIGHTNESS_FILE = "/sys/class/leds/lcd-backlight/max_brightness"; static constexpr const char* MAX_BRIGHTNESS_FILE = "/sys/class/leds/lcd-backlight/max_brightness";
static constexpr const char* BRIGHTNESS_FILE_SDM =
"/sys/class/backlight/panel0-backlight/brightness";
static constexpr const char* MAX_BRIGHTNESS_FILE_SDM =
"/sys/class/backlight/panel0-backlight/max_brightness";
RecoveryUI::RecoveryUI() RecoveryUI::RecoveryUI()
: brightness_normal_(50), : brightness_normal_(50),
brightness_dimmed_(25), brightness_dimmed_(25),
brightness_file_(BRIGHTNESS_FILE),
max_brightness_file_(MAX_BRIGHTNESS_FILE),
touch_screen_allowed_(false), touch_screen_allowed_(false),
kTouchLowThreshold(RECOVERY_UI_TOUCH_LOW_THRESHOLD), kTouchLowThreshold(RECOVERY_UI_TOUCH_LOW_THRESHOLD),
kTouchHighThreshold(RECOVERY_UI_TOUCH_HIGH_THRESHOLD), kTouchHighThreshold(RECOVERY_UI_TOUCH_HIGH_THRESHOLD),
@@ -101,12 +107,17 @@ bool RecoveryUI::InitScreensaver() {
if (brightness_normal_ == 0 || brightness_dimmed_ > brightness_normal_) { if (brightness_normal_ == 0 || brightness_dimmed_ > brightness_normal_) {
return false; return false;
} }
if (access(brightness_file_.c_str(), R_OK | W_OK)) {
brightness_file_ = BRIGHTNESS_FILE_SDM;
}
if (access(max_brightness_file_.c_str(), R_OK)) {
max_brightness_file_ = MAX_BRIGHTNESS_FILE_SDM;
}
// Set the initial brightness level based on the max brightness. Note that reading the initial // Set the initial brightness level based on the max brightness. Note that reading the initial
// value from BRIGHTNESS_FILE doesn't give the actual brightness value (bullhead, sailfish), so // value from BRIGHTNESS_FILE doesn't give the actual brightness value (bullhead, sailfish), so
// we don't have a good way to query the default value. // we don't have a good way to query the default value.
std::string content; std::string content;
if (!android::base::ReadFileToString(MAX_BRIGHTNESS_FILE, &content)) { if (!android::base::ReadFileToString(max_brightness_file_, &content)) {
PLOG(WARNING) << "Failed to read max brightness"; PLOG(WARNING) << "Failed to read max brightness";
return false; return false;
} }
@@ -120,7 +131,7 @@ bool RecoveryUI::InitScreensaver() {
brightness_normal_value_ = max_value * brightness_normal_ / 100.0; brightness_normal_value_ = max_value * brightness_normal_ / 100.0;
brightness_dimmed_value_ = max_value * brightness_dimmed_ / 100.0; brightness_dimmed_value_ = max_value * brightness_dimmed_ / 100.0;
if (!android::base::WriteStringToFile(std::to_string(brightness_normal_value_), if (!android::base::WriteStringToFile(std::to_string(brightness_normal_value_),
BRIGHTNESS_FILE)) { brightness_file_)) {
PLOG(WARNING) << "Failed to set brightness"; PLOG(WARNING) << "Failed to set brightness";
return false; return false;
} }
@@ -430,13 +441,13 @@ int RecoveryUI::WaitKey() {
// Lower the brightness level: NORMAL -> DIMMED; DIMMED -> OFF. // Lower the brightness level: NORMAL -> DIMMED; DIMMED -> OFF.
if (screensaver_state_ == ScreensaverState::NORMAL) { if (screensaver_state_ == ScreensaverState::NORMAL) {
if (android::base::WriteStringToFile(std::to_string(brightness_dimmed_value_), if (android::base::WriteStringToFile(std::to_string(brightness_dimmed_value_),
BRIGHTNESS_FILE)) { brightness_file_)) {
LOG(INFO) << "Brightness: " << brightness_dimmed_value_ << " (" << brightness_dimmed_ LOG(INFO) << "Brightness: " << brightness_dimmed_value_ << " (" << brightness_dimmed_
<< "%)"; << "%)";
screensaver_state_ = ScreensaverState::DIMMED; screensaver_state_ = ScreensaverState::DIMMED;
} }
} else if (screensaver_state_ == ScreensaverState::DIMMED) { } else if (screensaver_state_ == ScreensaverState::DIMMED) {
if (android::base::WriteStringToFile("0", BRIGHTNESS_FILE)) { if (android::base::WriteStringToFile("0", brightness_file_)) {
LOG(INFO) << "Brightness: 0 (off)"; LOG(INFO) << "Brightness: 0 (off)";
screensaver_state_ = ScreensaverState::OFF; screensaver_state_ = ScreensaverState::OFF;
} }
@@ -451,7 +462,7 @@ int RecoveryUI::WaitKey() {
// Reset the brightness to normal. // Reset the brightness to normal.
if (android::base::WriteStringToFile(std::to_string(brightness_normal_value_), if (android::base::WriteStringToFile(std::to_string(brightness_normal_value_),
BRIGHTNESS_FILE)) { brightness_file_)) {
screensaver_state_ = ScreensaverState::NORMAL; screensaver_state_ = ScreensaverState::NORMAL;
LOG(INFO) << "Brightness: " << brightness_normal_value_ << " (" << brightness_normal_ LOG(INFO) << "Brightness: " << brightness_normal_value_ << " (" << brightness_normal_
<< "%)"; << "%)";
ui.h
+2
View File
@@ -148,6 +148,8 @@ class RecoveryUI {
// be configured via subclassing. Setting brightness_normal_ to 0 to disable screensaver. // be configured via subclassing. Setting brightness_normal_ to 0 to disable screensaver.
unsigned int brightness_normal_; unsigned int brightness_normal_;
unsigned int brightness_dimmed_; unsigned int brightness_dimmed_;
std::string brightness_file_;
std::string max_brightness_file_;
// Whether we should listen for touch inputs (default: false). // Whether we should listen for touch inputs (default: false).
bool touch_screen_allowed_; bool touch_screen_allowed_;