diff options
author | Tao Bao <tbao@google.com> | 2018-11-06 02:55:38 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-11-06 02:55:38 +0100 |
commit | 18a5d529cdd94616705b85686b53d2ce07b026a4 (patch) | |
tree | 302138aef8f58cd554245b9581a506e1fef2fa2b /wear_ui.cpp | |
parent | Merge "updater: Error out on underrun during patching." (diff) | |
parent | Merge "ui: Manage loaded resources with smart pointers." (diff) | |
download | android_bootable_recovery-18a5d529cdd94616705b85686b53d2ce07b026a4.tar android_bootable_recovery-18a5d529cdd94616705b85686b53d2ce07b026a4.tar.gz android_bootable_recovery-18a5d529cdd94616705b85686b53d2ce07b026a4.tar.bz2 android_bootable_recovery-18a5d529cdd94616705b85686b53d2ce07b026a4.tar.lz android_bootable_recovery-18a5d529cdd94616705b85686b53d2ce07b026a4.tar.xz android_bootable_recovery-18a5d529cdd94616705b85686b53d2ce07b026a4.tar.zst android_bootable_recovery-18a5d529cdd94616705b85686b53d2ce07b026a4.zip |
Diffstat (limited to 'wear_ui.cpp')
-rw-r--r-- | wear_ui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp index 0611f94c9..6da84c924 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -51,8 +51,8 @@ void WearRecoveryUI::draw_background_locked() { gr_color(0, 0, 0, 255); gr_fill(0, 0, gr_fb_width(), gr_fb_height()); - if (currentIcon != NONE) { - GRSurface* frame = GetCurrentFrame(); + if (current_icon_ != NONE) { + const auto& frame = GetCurrentFrame(); int frame_width = gr_get_width(frame); int frame_height = gr_get_height(frame); int frame_x = (gr_fb_width() - frame_width) / 2; @@ -60,7 +60,7 @@ void WearRecoveryUI::draw_background_locked() { gr_blit(frame, 0, 0, frame_width, frame_height, frame_x, frame_y); // Draw recovery text on screen above progress bar. - GRSurface* text = GetCurrentText(); + const auto& text = GetCurrentText(); int text_x = (ScreenWidth() - gr_get_width(text)) / 2; int text_y = GetProgressBaseline() - gr_get_height(text) - 10; gr_color(255, 255, 255, 255); |