SystemTask: Use "&&" instead of "and" for operators

As per the coding style, only primary spelling should be used for operators.
This commit is contained in:
Christoph Honal 2022-05-10 21:10:10 +02:00 committed by Riku Isokoski
parent 702f65d3ee
commit 03a2059e87

View file

@ -264,15 +264,16 @@ void SystemTask::Work() {
case Messages::TouchWakeUp: { case Messages::TouchWakeUp: {
if (touchHandler.GetNewTouchInfo()) { if (touchHandler.GetNewTouchInfo()) {
auto gesture = touchHandler.GestureGet(); auto gesture = touchHandler.GestureGet();
if (gesture != Pinetime::Applications::TouchEvents::None and if (gesture != Pinetime::Applications::TouchEvents::None &&
((gesture == Pinetime::Applications::TouchEvents::DoubleTap and ((gesture == Pinetime::Applications::TouchEvents::DoubleTap &&
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) or settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) ||
(gesture == Pinetime::Applications::TouchEvents::Tap and (gesture == Pinetime::Applications::TouchEvents::Tap &&
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap)))) { settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap)))) {
GoToRunning(); GoToRunning();
} }
} }
} break; break;
}
case Messages::GoToSleep: case Messages::GoToSleep:
if (doNotGoToSleep) { if (doNotGoToSleep) {
break; break;