diff options
author | Tao Bao <tbao@google.com> | 2017-08-22 19:36:06 +0200 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-22 19:36:06 +0200 |
commit | 2e1b3a418e9de29fcb4d75b769974e46395ce6cd (patch) | |
tree | 422cef83fa228cfb2a2464c6a7f49e6b5d856506 /wear_ui.cpp | |
parent | screen_ui: Fix a case that may truncate the last char. (diff) | |
parent | wear_ui: Expose menu_unusable_rows via Makefile var. (diff) | |
download | android_bootable_recovery-2e1b3a418e9de29fcb4d75b769974e46395ce6cd.tar android_bootable_recovery-2e1b3a418e9de29fcb4d75b769974e46395ce6cd.tar.gz android_bootable_recovery-2e1b3a418e9de29fcb4d75b769974e46395ce6cd.tar.bz2 android_bootable_recovery-2e1b3a418e9de29fcb4d75b769974e46395ce6cd.tar.lz android_bootable_recovery-2e1b3a418e9de29fcb4d75b769974e46395ce6cd.tar.xz android_bootable_recovery-2e1b3a418e9de29fcb4d75b769974e46395ce6cd.tar.zst android_bootable_recovery-2e1b3a418e9de29fcb4d75b769974e46395ce6cd.zip |
Diffstat (limited to '')
-rw-r--r-- | wear_ui.cpp | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp index 18c30d34a..169ef20e1 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -51,10 +51,16 @@ static double now() { } WearRecoveryUI::WearRecoveryUI() - : progress_bar_y(259), outer_height(0), outer_width(0), menu_unusable_rows(0) { + : kProgressBarBaseline(RECOVERY_UI_PROGRESS_BAR_BASELINE), + kMenuUnusableRows(RECOVERY_UI_MENU_UNUSABLE_ROWS) { + // TODO: kMenuUnusableRows should be computed based on the lines in draw_screen_locked(). + + // TODO: The following three variables are likely not needed. The first two are detected + // automatically in ScreenRecoveryUI::LoadAnimation(), based on the actual files seen on device. intro_frames = 22; loop_frames = 60; - animation_fps = 30; + + touch_screen_allowed_ = true; for (size_t i = 0; i < 5; i++) backgroundIcon[i] = NULL; @@ -62,7 +68,7 @@ WearRecoveryUI::WearRecoveryUI() } int WearRecoveryUI::GetProgressBaseline() const { - return progress_bar_y; + return kProgressBarBaseline; } // Draw background frame on the screen. Does not flip pages. @@ -113,8 +119,8 @@ void WearRecoveryUI::draw_screen_locked() { SetColor(TEXT_FILL); gr_fill(0, 0, gr_fb_width(), gr_fb_height()); - int y = outer_height; - int x = outer_width; + int y = kMarginHeight; + int x = kMarginWidth; if (show_menu) { std::string recovery_fingerprint = android::base::GetProperty("ro.bootimage.build.fingerprint", ""); @@ -170,7 +176,7 @@ void WearRecoveryUI::draw_screen_locked() { int ty; int row = (text_top_ + text_rows_ - 1) % text_rows_; size_t count = 0; - for (int ty = gr_fb_height() - char_height_ - outer_height; ty > y + 2 && count < text_rows_; + for (int ty = gr_fb_height() - char_height_ - kMarginHeight; ty > y + 2 && count < text_rows_; ty -= char_height_, ++count) { gr_text(gr_sys_font(), x + 4, ty, text_[row], 0); --row; @@ -190,12 +196,12 @@ bool WearRecoveryUI::InitTextParams() { return false; } - text_cols_ = (gr_fb_width() - (outer_width * 2)) / char_width_; + text_cols_ = (gr_fb_width() - (kMarginWidth * 2)) / char_width_; if (text_rows_ > kMaxRows) text_rows_ = kMaxRows; if (text_cols_ > kMaxCols) text_cols_ = kMaxCols; - visible_text_rows = (gr_fb_height() - (outer_height * 2)) / char_height_; + visible_text_rows = (gr_fb_height() - (kMarginHeight * 2)) / char_height_; return true; } @@ -263,7 +269,7 @@ void WearRecoveryUI::StartMenu(const char* const* headers, const char* const* it show_menu = true; menu_sel = initial_selection; menu_start = 0; - menu_end = visible_text_rows - 1 - menu_unusable_rows; + menu_end = visible_text_rows - 1 - kMenuUnusableRows; if (menu_items <= menu_end) menu_end = menu_items; update_screen_locked(); } |