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, 7 deletions

diff --git a/src/displayapp/screens/Twos.cpp b/src/displayapp/screens/Twos.cpp
index b51a9ec6..7a3ed1e4 100644
--- a/src/displayapp/screens/Twos.cpp
+++ b/src/displayapp/screens/Twos.cpp
@@ -101,11 +101,6 @@ bool Twos::Refresh() {
   return running;
 }
 
-bool Twos::OnButtonPushed() {
-  running = false;
-  return true;
-}
-
 bool Twos::placeNewTile() {
   std::vector< std::pair <int,int> > availableCells; 
   for(int row = 0; row < 4; row++) {
@@ -158,8 +153,7 @@ bool Twos::tryMove(Tile grid[][4], int newRow, int newCol, int oldRow, int oldCo
 }
 
 bool Twos::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
-  bool validMove;
-  validMove = false;
+  bool validMove = false;
   for(int row = 0; row < 4; row++) {
     for(int col = 0; col < 4; col++) {
       grid[row][col].merged = false; // reinitialize merge state