commit efef45ede6f7588bd3f584d7746ca9822ade58ac
author Michael Runge <mrunge@google.com> Wed Oct 02 17:00:24 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 02 17:00:24 2013 -0700
tree da7f5b66dc3593d57dc0c66c654caeec44013878
parent dd92a4d625a6735651efeb12a5707620bc5c6339
parent a2a1ce823b8c76451ee2b38155b347b0c2ced714

am a2a1ce82: Allow child classes to override the overlay location for the update image.

* commit 'a2a1ce823b8c76451ee2b38155b347b0c2ced714':
  Allow child classes to override the overlay location for the update image.

screen_ui.h

diff --git a/screen_ui.h b/screen_ui.h
index 0bd220f..fc35d95 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -58,6 +58,9 @@
     enum UIElement { HEADER, MENU, MENU_SEL_BG, MENU_SEL_FG, LOG, TEXT_FILL };
     virtual void SetColor(UIElement e);
 
+  protected:
+    int install_overlay_offset_x, install_overlay_offset_y;
+
   private:
     Icon currentIcon;
     int installingFrame;
@@ -99,7 +102,6 @@
     int animation_fps;
     int indeterminate_frames;
     int installing_frames;
-    int install_overlay_offset_x, install_overlay_offset_y;
     int overlay_offset_x, overlay_offset_y;
 
     void draw_install_overlay_locked(int frame);