Merge branch 'develop' into infineat-external-resources

# Conflicts:
#	src/displayapp/screens/Symbols.h
#	src/displayapp/screens/settings/SettingWatchFace.cpp
#	src/displayapp/screens/settings/SettingWatchFace.h

2 files changed, 1 insertions, 13 deletions

diff --git a/src/components/brightness/BrightnessController.cpp b/src/components/brightness/BrightnessController.cpp
index 2d9f980a..0392158c 100644
--- a/src/components/brightness/BrightnessController.cpp
+++ b/src/components/brightness/BrightnessController.cpp
@@ -74,14 +74,6 @@ BrightnessController::Levels BrightnessController::Level() const {
   return level;
 }
 
-void BrightnessController::Backup() {
-  backupLevel = level;
-}
-
-void BrightnessController::Restore() {
-  Set(backupLevel);
-}
-
 void BrightnessController::Step() {
   switch (level) {
     case Levels::Low:
@@ -123,4 +115,4 @@ const char* BrightnessController::ToString() {
     default:
       return "???";
   }
-}
\ No newline at end of file
+}
diff --git a/src/components/brightness/BrightnessController.h b/src/components/brightness/BrightnessController.h
index 0d7ac2ff..7f86759a 100644
--- a/src/components/brightness/BrightnessController.h
+++ b/src/components/brightness/BrightnessController.h
@@ -15,15 +15,11 @@ namespace Pinetime {
       void Higher();
       void Step();
 
-      void Backup();
-      void Restore();
-
       const char* GetIcon();
       const char* ToString();
 
     private:
       Levels level = Levels::High;
-      Levels backupLevel = Levels::High;
     };
   }
 }