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/DropDownDemo.cpp b/src/displayapp/screens/DropDownDemo.cpp
index 944c63bb..c3ec5d7d 100644
--- a/src/displayapp/screens/DropDownDemo.cpp
+++ b/src/displayapp/screens/DropDownDemo.cpp
@@ -44,11 +44,6 @@ bool DropDownDemo::Refresh() {
   return running;
 }
 
-bool DropDownDemo::OnButtonPushed() {
-  running = false;
-  return true;
-}
-
 bool DropDownDemo::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   // If the dropdown is opened, notify Display app that it doesn't need to handle the event
   // (this will prevent displayApp from going back to the menu or clock scree).