Author: Victor Kareh <vkareh@redhat.com>
DisplayApp: Go to clock on sleep if no app loaded When turning off the screen, if there is no actual app loaded (i.e. we are still in the Launcher, Notifications, QuickSettings, or Settings screens) we should just reload the Clock app directly.
src/displayapp/DisplayApp.cpp | 16 ++++++++++++++--
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 394a32393290adf97223b063f05ea0bb60cc1b3e..3be7656dc8c15bff9d348d89d21bf46e6ab4360d 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -293,15 +293,27 @@ while (brightnessController.Level() != Controllers::BrightnessController::Levels::Low) {
brightnessController.Lower();
vTaskDelay(100);
}
- // Don't actually turn off the display for AlwaysOn mode
+ // Turn brightness down (or set to AlwaysOn mode)
if (settingsController.GetAlwaysOnDisplay()) {
brightnessController.Set(Controllers::BrightnessController::Levels::AlwaysOn);
+ } else {
+ brightnessController.Set(Controllers::BrightnessController::Levels::Off);
+ }
+ // Since the active screen is not really an app, go back to Clock.
+ if (currentApp == Apps::Launcher || currentApp == Apps::Notifications || currentApp == Apps::QuickSettings ||
+ currentApp == Apps::Settings) {
+ LoadScreen(Apps::Clock, DisplayApp::FullRefreshDirections::None);
+ // Wait for the clock app to load before moving on.
+ while (!lv_task_handler()) {
+ };
+ }
+ // Turn LCD display off (or set to low power for AlwaysOn mode)
+ if (settingsController.GetAlwaysOnDisplay()) {
lcd.LowPowerOn();
// Record idle entry time
alwaysOnTickCount = 0;
alwaysOnStartTime = xTaskGetTickCount();
} else {
- brightnessController.Set(Controllers::BrightnessController::Levels::Off);
lcd.Sleep();
}
PushMessageToSystemTask(Pinetime::System::Messages::OnDisplayTaskSleeping);