Merge branch 'develop' into motion-sensor

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/DisplayApp.h
#	src/displayapp/lv_pinetime_theme.c
#	src/displayapp/screens/ApplicationList.cpp
#	src/drivers/TwiMaster.cpp
#	src/systemtask/SystemTask.h

1 files changed, 0 insertions, 5 deletions

diff --git a/src/displayapp/screens/Brightness.cpp b/src/displayapp/screens/Brightness.cpp
index 36820417..38469cf5 100644
--- a/src/displayapp/screens/Brightness.cpp
+++ b/src/displayapp/screens/Brightness.cpp
@@ -33,11 +33,6 @@ bool Brightness::Refresh() {
   return running;
 }
 
-bool Brightness::OnButtonPushed() {
-  running = false;
-  return true;
-}
-
 const char *Brightness::LevelToString(Pinetime::Controllers::BrightnessController::Levels level) {
   switch(level) {
     case Pinetime::Controllers::BrightnessController::Levels::Off: return "Off";