Merge branch 'develop' into refresh_rework

2021-08-03 12:16:40 +03:00
parent fc93bdbbba 514481ef7f
commit 10b5d30ec3
40 changed files with 340 additions and 232 deletions
--- a/src/displayapp/screens/SystemInfo.h
+++ b/src/displayapp/screens/SystemInfo.h
@@ -30,12 +30,9 @@ namespace Pinetime {
                            Pinetime::Drivers::WatchdogView& watchdog,
                            Pinetime::Controllers::MotionController& motionController);
        ~SystemInfo() override;
-        bool OnButtonPushed() override;
        bool OnTouchEvent(TouchEvents event) override;

      private:
-        bool running = true;
-
        Pinetime::Controllers::DateTime& dateTimeController;
        Pinetime::Controllers::Battery& batteryController;
        Pinetime::Controllers::BrightnessController& brightnessController;