commit 99b2d774751041a5cfb5a48ac93292bb92acef98
author Tao Bao <tbao@google.com> Fri Jun 23 22:47:03 2017 -0700
committer Tao Bao <tbao@google.com> Fri Jun 23 23:06:01 2017 -0700
tree cf0e859e660be2b9f2a3384c65c67492728ae190
parent 5d2e3bd109539282d1829e3579c1f762a9486382

Add override specifier and member constness to RecoveryUI classes.

Test: mmma bootable/recovery
Change-Id: I66e328614423488a4027d7878f4569fbf3a3721e

screen_ui.cpp

diff --git a/screen_ui.cpp b/screen_ui.cpp
index 6172b63..bcfaaa4 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -82,14 +82,14 @@
       max_stage(-1),
       updateMutex(PTHREAD_MUTEX_INITIALIZER) {}
 
-GRSurface* ScreenRecoveryUI::GetCurrentFrame() {
+GRSurface* ScreenRecoveryUI::GetCurrentFrame() const {
   if (currentIcon == INSTALLING_UPDATE || currentIcon == ERASING) {
     return intro_done ? loopFrames[current_frame] : introFrames[current_frame];
   }
   return error_icon;
 }
 
-GRSurface* ScreenRecoveryUI::GetCurrentText() {
+GRSurface* ScreenRecoveryUI::GetCurrentText() const {
   switch (currentIcon) {
     case ERASING:
       return erasing_text;
@@ -132,16 +132,16 @@
   { 262,  52, 112, },  // LANDSCAPE_LARGE
 };
 
-int ScreenRecoveryUI::GetAnimationBaseline() {
+int ScreenRecoveryUI::GetAnimationBaseline() const {
   return GetTextBaseline() - PixelsFromDp(kLayouts[layout_][ICON]) - gr_get_height(loopFrames[0]);
 }
 
-int ScreenRecoveryUI::GetTextBaseline() {
+int ScreenRecoveryUI::GetTextBaseline() const {
   return GetProgressBaseline() - PixelsFromDp(kLayouts[layout_][TEXT]) -
          gr_get_height(installing_text);
 }
 
-int ScreenRecoveryUI::GetProgressBaseline() {
+int ScreenRecoveryUI::GetProgressBaseline() const {
   return gr_fb_height() - PixelsFromDp(kLayouts[layout_][PROGRESS]) -
          gr_get_height(progressBarFill);
 }
@@ -224,7 +224,7 @@
   }
 }
 
-void ScreenRecoveryUI::SetColor(UIElement e) {
+void ScreenRecoveryUI::SetColor(UIElement e) const {
   switch (e) {
     case INFO:
       gr_color(249, 194, 0, 255);
@@ -254,7 +254,7 @@
   }
 }
 
-void ScreenRecoveryUI::DrawHorizontalRule(int* y) {
+void ScreenRecoveryUI::DrawHorizontalRule(int* y) const {
   SetColor(MENU);
   *y += 4;
   gr_fill(0, *y, gr_fb_width(), *y + 2);