summaryrefslogtreecommitdiffstats
path: root/screen_ui.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-06-21 03:11:21 +0200
committerTao Bao <tbao@google.com>2017-06-22 21:40:22 +0200
commita92d8fb45676566a56d7c27d2e8fb644523adc94 (patch)
treeacf6f62b4a38162c3f308c3cb3ec120822ada21b /screen_ui.cpp
parentscreen_ui: Allow setting screen margin space. (diff)
downloadandroid_bootable_recovery-a92d8fb45676566a56d7c27d2e8fb644523adc94.tar
android_bootable_recovery-a92d8fb45676566a56d7c27d2e8fb644523adc94.tar.gz
android_bootable_recovery-a92d8fb45676566a56d7c27d2e8fb644523adc94.tar.bz2
android_bootable_recovery-a92d8fb45676566a56d7c27d2e8fb644523adc94.tar.lz
android_bootable_recovery-a92d8fb45676566a56d7c27d2e8fb644523adc94.tar.xz
android_bootable_recovery-a92d8fb45676566a56d7c27d2e8fb644523adc94.tar.zst
android_bootable_recovery-a92d8fb45676566a56d7c27d2e8fb644523adc94.zip
Diffstat (limited to 'screen_ui.cpp')
-rw-r--r--screen_ui.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp
index 2dc1cc4c9..d21a64890 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -51,7 +51,9 @@ static double now() {
}
ScreenRecoveryUI::ScreenRecoveryUI()
- : density_(static_cast<float>(android::base::GetIntProperty("ro.sf.lcd_density", 160)) / 160.f),
+ : kMarginWidth(RECOVERY_UI_MARGIN_WIDTH),
+ kMarginHeight(RECOVERY_UI_MARGIN_HEIGHT),
+ density_(static_cast<float>(android::base::GetIntProperty("ro.sf.lcd_density", 160)) / 160.f),
currentIcon(NONE),
progressBarType(EMPTY),
progressScopeStart(0),
@@ -78,8 +80,6 @@ ScreenRecoveryUI::ScreenRecoveryUI()
animation_fps(30), // TODO: there's currently no way to infer this.
stage(-1),
max_stage(-1),
- margin_width_(0),
- margin_height_(0),
updateMutex(PTHREAD_MUTEX_INITIALIZER) {}
GRSurface* ScreenRecoveryUI::GetCurrentFrame() {
@@ -296,8 +296,8 @@ void ScreenRecoveryUI::draw_screen_locked() {
gr_clear();
static constexpr int TEXT_INDENT = 4;
- int x = TEXT_INDENT + margin_width_;
- int y = margin_height_;
+ int x = TEXT_INDENT + kMarginWidth;
+ int y = kMarginHeight;
if (show_menu) {
std::string recovery_fingerprint =
android::base::GetProperty("ro.bootimage.build.fingerprint", "");
@@ -336,7 +336,7 @@ void ScreenRecoveryUI::draw_screen_locked() {
SetColor(LOG);
int row = (text_top_ + text_rows_ - 1) % text_rows_;
size_t count = 0;
- for (int ty = gr_fb_height() - margin_height_ - char_height_ - log_bottom_offset_;
+ for (int ty = gr_fb_height() - kMarginHeight - char_height_ - log_bottom_offset_;
ty >= y && count < text_rows_; ty -= char_height_, ++count) {
int temp_y = ty;
DrawTextLine(x, &temp_y, text_[row], false);
@@ -457,8 +457,8 @@ bool ScreenRecoveryUI::InitTextParams() {
}
gr_font_size(gr_sys_font(), &char_width_, &char_height_);
- text_rows_ = (gr_fb_height() - margin_height_ * 2) / char_height_;
- text_cols_ = (gr_fb_width() - margin_width_ * 2) / char_width_;
+ text_rows_ = (gr_fb_height() - kMarginHeight * 2) / char_height_;
+ text_cols_ = (gr_fb_width() - kMarginWidth * 2) / char_width_;
log_bottom_offset_ = 0;
return true;
}