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, 1 insertions, 6 deletions

diff --git a/src/displayapp/screens/ScreenList.h b/src/displayapp/screens/ScreenList.h
index 43b33f40..23bcd98b 100644
--- a/src/displayapp/screens/ScreenList.h
+++ b/src/displayapp/screens/ScreenList.h
@@ -29,11 +29,6 @@ namespace Pinetime {
             return running;
           }
 
-          bool OnButtonPushed() override {
-            running = false;
-            return true;
-          }
-
           bool OnTouchEvent(TouchEvents event) override {
 
             if ( mode == ScreenListModes::UpDown) {
@@ -108,7 +103,7 @@ namespace Pinetime {
           uint8_t screenIndex = 0;          
           std::unique_ptr<Screen> current;
 
-          bool running = true;
+          
       };
     }
   }