InfiniTime.git

diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index d75cd678abd641b2fe264a787667915f1cadf441..1ab67095084ea0d7c376125e7e9caf32b8ea671d 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -196,6 +196,14 @@       void SetNotificationStatus(Notification status) {
         if (status != settings.notificationStatus) {
           settingsChanged = true;
         }
+        // Disable always on screen while sleep mode is enabled
+        if (settings.alwaysOnDisplay.enabled) {
+          if (status == Notification::Sleep) {
+            settings.alwaysOnDisplay.state = false;
+          } else {
+            settings.alwaysOnDisplay.state = true;
+          }
+        }
         settings.notificationStatus = status;
       };
 
@@ -215,15 +223,31 @@         return settings.screenTimeOut;
       };
 
       void SetAlwaysOnDisplay(bool state) {
-        if (state != settings.alwaysOnDisplay) {
+        if (state != settings.alwaysOnDisplay.state) {
           settingsChanged = true;
         }
-        settings.alwaysOnDisplay = state;
+        settings.alwaysOnDisplay.state = state;
       };
 
       bool GetAlwaysOnDisplay() const {
-        return settings.alwaysOnDisplay;
+        return settings.alwaysOnDisplay.state;
       };
+
+      void SetAlwaysOnDisplaySetting(bool state) {
+        if (state != settings.alwaysOnDisplay.enabled) {
+          settingsChanged = true;
+        }
+        settings.alwaysOnDisplay.enabled = state;
+
+        // Don't enable always on if we are currently in notification sleep
+        if (GetNotificationStatus() != Notification::Sleep) {
+          SetAlwaysOnDisplay(state);
+        }
+      }
+
+      bool GetAlwaysOnDisplaySetting() const {
+        return settings.alwaysOnDisplay.enabled;
+      }
 
       void SetShakeThreshold(uint16_t thresh) {
         if (settings.shakeWakeThreshold != thresh) {
@@ -299,12 +323,19 @@       Pinetime::Controllers::FS& fs;
 
       static constexpr uint32_t settingsVersion = 0x0008;
 
+      // To enable disabling it during notification sleep, differentiate between
+      // the setting being on, and the setting being set by the user
+      struct alwaysOnDisplayData {
+        bool enabled = false;
+        bool state = false;
+      };
+
       struct SettingsData {
         uint32_t version = settingsVersion;
         uint32_t stepsGoal = 10000;
         uint32_t screenTimeOut = 15000;
 
-        bool alwaysOnDisplay = false;
+        alwaysOnDisplayData alwaysOnDisplay;
 
         ClockType clockType = ClockType::H24;
         WeatherFormat weatherFormat = WeatherFormat::Metric;




diff --git a/src/displayapp/screens/settings/SettingDisplay.cpp b/src/displayapp/screens/settings/SettingDisplay.cpp
index 12d0f561f1b4e0a6b8c27270acaffeadf2bdb7aa..57a64d7fc75e30d5c005c62c0e28ae7cd7c1f77b 100644
--- a/src/displayapp/screens/settings/SettingDisplay.cpp
+++ b/src/displayapp/screens/settings/SettingDisplay.cpp
@@ -66,7 +66,7 @@   }
 
   alwaysOnCheckbox = lv_checkbox_create(container1, nullptr);
   lv_checkbox_set_text(alwaysOnCheckbox, "Always On");
-  lv_checkbox_set_checked(alwaysOnCheckbox, settingsController.GetAlwaysOnDisplay());
+  lv_checkbox_set_checked(alwaysOnCheckbox, settingsController.GetAlwaysOnDisplaySetting());
   lv_obj_add_state(alwaysOnCheckbox, LV_STATE_DEFAULT);
   alwaysOnCheckbox->user_data = this;
   lv_obj_set_event_cb(alwaysOnCheckbox, AlwaysOnEventHandler);
@@ -78,8 +78,8 @@   settingsController.SaveSettings();
 }
 
 void SettingDisplay::ToggleAlwaysOn() {
-  settingsController.SetAlwaysOnDisplay(!settingsController.GetAlwaysOnDisplay());
-  lv_checkbox_set_checked(alwaysOnCheckbox, settingsController.GetAlwaysOnDisplay());
+  settingsController.SetAlwaysOnDisplaySetting(!settingsController.GetAlwaysOnDisplaySetting());
+  lv_checkbox_set_checked(alwaysOnCheckbox, settingsController.GetAlwaysOnDisplaySetting());
 }
 
 void SettingDisplay::UpdateSelected(lv_obj_t* object, lv_event_t event) {