Replace Allow AOD with Enable AOD

Leaving it as "Allow AOD" assumes the user wants it the same
during the day as during sleep. In my opinion the user would
either want AOD on during sleep or they wouldn't.

Author: JustScott

src/components/settings/Settings.h

@@ -14,7 +14,7 @@ namespace Pinetime {
       enum class Notification : uint8_t { On, Off, Sleep };
       enum class ChimesOption : uint8_t { None, Hours, HalfHours };
       enum class WakeUpMode : uint8_t { SingleTap = 0, DoubleTap = 1, RaiseWrist = 2, Shake = 3, LowerWrist = 4 };
-      enum class SleepOption : uint8_t { AllowAOD = 0, AllowChimes = 1, AllowNotify = 2, DisableBle = 3 };
+      enum class SleepOption : uint8_t { AllowChimes = 0, AllowNotify = 1, DisableBle = 2, EnableAOD = 3 };
       enum class Colors : uint8_t {
         White,
         Silver,
@@ -216,11 +216,7 @@ namespace Pinetime {
       };
 
       bool GetAlwaysOnDisplay() const {
-        if (isSleepOptionOn(Controllers::Settings::SleepOption::AllowAOD)) {
-          return settings.alwaysOnDisplay;
-        } else {
-          return settings.alwaysOnDisplay && GetNotificationStatus() != Notification::Sleep;
-        }
+        return settings.alwaysOnDisplay && GetNotificationStatus() != Notification::Sleep;
       };
 
       void SetAlwaysOnDisplaySetting(bool state) {

src/displayapp/screens/settings/QuickSettings.cpp

@@ -151,7 +151,7 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object) {
       settingsController.SetNotificationStatus(Controllers::Settings::Notification::Off);
       lv_label_set_text_static(btn3_lvl, Symbols::notificationsOff);
       lv_obj_set_state(btn3, static_cast<lv_state_t>(ButtonState::NotificationsOff));
-      // Turn sleep on
+    // Turn sleep on
     } else if (settingsController.GetNotificationStatus() == Controllers::Settings::Notification::Off) {
       settingsController.SetNotificationStatus(Controllers::Settings::Notification::Sleep);
       lv_label_set_text_static(btn3_lvl, Symbols::sleep);
@@ -164,7 +164,7 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object) {
           settingsController.sleepDisabledBle = true;
         }
       }
-      // Turn notifications on
+    // Turn notifications on
     } else if (settingsController.GetNotificationStatus() == Controllers::Settings::Notification::Sleep) {
       settingsController.SetNotificationStatus(Controllers::Settings::Notification::On);
       lv_label_set_text_static(btn3_lvl, Symbols::notificationsOn);

src/displayapp/screens/settings/SettingSleep.h

@@ -26,10 +26,10 @@ namespace Pinetime {
 
         Controllers::Settings& settingsController;
         static constexpr std::array<Option, 4> options = {{
-          {Controllers::Settings::SleepOption::AllowAOD, "Allow AOD"},
           {Controllers::Settings::SleepOption::AllowChimes, "Allow Chimes"},
           {Controllers::Settings::SleepOption::AllowNotify, "Allow Notify"},
           {Controllers::Settings::SleepOption::DisableBle, "Disable BLE"},
+          {Controllers::Settings::SleepOption::EnableAOD, "Enable AOD"},
         }};
 
         lv_obj_t* cbOption[options.size()];

src/systemtask/SystemTask.cpp

@@ -419,11 +419,15 @@ void SystemTask::GoToSleep() {
     return;
   }
 
-  if (settingsController.GetAlwaysOnDisplay()) {
+  if (settingsController.isSleepOptionOn(Pinetime::Controllers::Settings::SleepOption::EnableAOD) &&
+      settingsController.GetNotificationStatus() == Pinetime::Controllers::Settings::Notification::Sleep) {
+    NRF_LOG_INFO("[systemtask] Always On Display Enabled For Sleep");
+    displayApp.PushMessage(Pinetime::Applications::Display::Messages::GoToAOD);
+  } else if (settingsController.GetAlwaysOnDisplay()) {
     NRF_LOG_INFO("[systemtask] Going To Always On Display");
     displayApp.PushMessage(Pinetime::Applications::Display::Messages::GoToAOD);
   } else {
-    NRF_LOG_INFO("[systemtask] Going To sleep");
+    NRF_LOG_INFO("[systemtask] Going To Sleep");
     displayApp.PushMessage(Pinetime::Applications::Display::Messages::GoToSleep);
   }
   heartRateApp.PushMessage(Pinetime::Applications::HeartRateTask::Messages::GoToSleep);