diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-02-23 20:18:59 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-02-23 20:18:59 (GMT) |
| commit | f864330d355172046fab0923fd9015ec52884f00 (patch) | |
| tree | 0fd8743c9ea357d6f3ac61949292187113d3867f /src/displayapp/screens/ApplicationList.cpp | |
| parent | 324c7dab326ea23a6c8502bbb8c6e9b9d87a839f (diff) | |
| parent | 3fe3f06299b37b99cad117e0ec726735acbdc721 (diff) | |
Merge branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into joaquimorg-LVGL7
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/DisplayApp.cpp
# src/displayapp/screens/Modal.cpp
# src/displayapp/screens/Modal.h
# src/displayapp/screens/Notifications.cpp
# src/displayapp/screens/Tile.h
Diffstat (limited to 'src/displayapp/screens/ApplicationList.cpp')
| -rw-r--r-- | src/displayapp/screens/ApplicationList.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp index dd7fcd4..531636e 100644 --- a/src/displayapp/screens/ApplicationList.cpp +++ b/src/displayapp/screens/ApplicationList.cpp @@ -71,7 +71,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen2() { std::unique_ptr<Screen> ApplicationList::CreateScreen3() { std::array<Screens::Tile::Applications, 6> applications { {{"A", Apps::Meter}, - {"B", Apps::Gauge}, + {"B", Apps::Navigation}, {"C", Apps::Clock}, {"D", Apps::Music}, {"E", Apps::SysInfo}, |