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/settings/QuickSettings.h
+++ b/src/displayapp/screens/settings/QuickSettings.h
@@ -27,7 +27,6 @@ namespace Pinetime {

        ~QuickSettings() override;

-        bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
        void OnButtonEvent(lv_obj_t* object, lv_event_t event);

        void UpdateScreen();