aod: fix aod setting during notification sleep

KaffeinatedKat · KaffeinatedKat · commit fa7f94d37494 · 2024-02-11T12:56:57.000-07:00
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
@@ -238,9 +238,11 @@ namespace Pinetime {
           settingsChanged = true;
         }
         settings.alwaysOnDisplay.enabled = state;
-        // the always on state and enabled flags should always match
-        // if the setting is being modified by the user
-        SetAlwaysOnDisplay(state);
+
+        // Don't enable the aod if we are currently in notification sleep
+        if (GetNotificationStatus() != Notification::Sleep) {
+          SetAlwaysOnDisplay(state);
+        }
       }
 
       bool GetAlwaysOnDisplaySetting() const {

Original file line number	Diff line number	Diff line change
`@@ -238,9 +238,11 @@ namespace Pinetime {`
`238`	`238`	`settingsChanged = true;`
`239`	`239`	`}`
`240`	`240`	`settings.alwaysOnDisplay.enabled = state;`
`241`		`- // the always on state and enabled flags should always match`
`242`		`- // if the setting is being modified by the user`
`243`		`- SetAlwaysOnDisplay(state);`
	`241`	`+`
	`242`	`+ // Don't enable the aod if we are currently in notification sleep`
	`243`	`+ if (GetNotificationStatus() != Notification::Sleep) {`
	`244`	`+ SetAlwaysOnDisplay(state);`
	`245`	`+ }`
`244`	`246`	`}`
`245`	`247`
`246`	`248`	`bool GetAlwaysOnDisplaySetting() const {`