From f7f9e50528761022989c4f0cac6a92716b54674f Mon Sep 17 00:00:00 2001
From: Prashant Malani <pmalani@google.com>
Date: Thu, 10 Mar 2016 03:40:20 +0000
Subject: Revert "recovery: More refactoring of WearUI"

This reverts commit 1c7b2230d8aac9f064f68c48b6aa26aca000cc9d.

This change can lead to the derived class indirectly (and incorrectly) calling some functions from the base class, which can lead to unpredictable behavior.

Bug: 27407422
Change-Id: I126a7489b0787dc195e942e2ceea6769de20d70c
---
 screen_ui.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'screen_ui.h')

diff --git a/screen_ui.h b/screen_ui.h
index 386deac2d..08a5f44a9 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -68,6 +68,7 @@ class ScreenRecoveryUI : public RecoveryUI {
     void SetColor(UIElement e);
 
   private:
+    Icon currentIcon;
     int installingFrame;
     const char* locale;
     bool rtl_locale;
@@ -138,8 +139,6 @@ class ScreenRecoveryUI : public RecoveryUI {
     void LoadBitmap(const char* filename, GRSurface** surface);
     void LoadBitmapArray(const char* filename, int* frames, int* fps, GRSurface*** surface);
     void LoadLocalizedBitmap(const char* filename, GRSurface** surface);
-  protected:
-    Icon currentIcon;
 };
 
 #endif  // RECOVERY_UI_H
-- 
cgit v1.2.3