summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-07-13 22:45:48 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-07-13 22:45:48 +0200
commit762c42d6f6e9aa56738efc1fca72298f0284cd9f (patch)
treebf5c7f6374aa4068be15bc25ed913e6edcc4bd96
parentImport translations. DO NOT MERGE am: 28b67f8eea -s ours (diff)
parentMerge "Fix the missing char when showing recovery logs." (diff)
downloadandroid_bootable_recovery-762c42d6f6e9aa56738efc1fca72298f0284cd9f.tar
android_bootable_recovery-762c42d6f6e9aa56738efc1fca72298f0284cd9f.tar.gz
android_bootable_recovery-762c42d6f6e9aa56738efc1fca72298f0284cd9f.tar.bz2
android_bootable_recovery-762c42d6f6e9aa56738efc1fca72298f0284cd9f.tar.lz
android_bootable_recovery-762c42d6f6e9aa56738efc1fca72298f0284cd9f.tar.xz
android_bootable_recovery-762c42d6f6e9aa56738efc1fca72298f0284cd9f.tar.zst
android_bootable_recovery-762c42d6f6e9aa56738efc1fca72298f0284cd9f.zip
-rw-r--r--screen_ui.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp
index d9574d869..8f792f162 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -301,15 +301,15 @@ void ScreenRecoveryUI::draw_screen_locked() {
gr_color(0, 0, 0, 255);
gr_clear();
- static constexpr int TEXT_INDENT = 4;
- int x = TEXT_INDENT + kMarginWidth;
int y = kMarginHeight;
if (show_menu) {
- std::string recovery_fingerprint =
- android::base::GetProperty("ro.bootimage.build.fingerprint", "");
+ static constexpr int kMenuIndent = 4;
+ int x = kMarginWidth + kMenuIndent;
SetColor(INFO);
y += DrawTextLine(x, y, "Android Recovery", true);
+ std::string recovery_fingerprint =
+ android::base::GetProperty("ro.bootimage.build.fingerprint", "");
for (const auto& chunk : android::base::Split(recovery_fingerprint, ":")) {
y += DrawTextLine(x, y, chunk.c_str(), false);
}
@@ -343,7 +343,7 @@ void ScreenRecoveryUI::draw_screen_locked() {
size_t count = 0;
for (int ty = gr_fb_height() - kMarginHeight - char_height_; ty >= y && count < text_rows_;
ty -= char_height_, ++count) {
- DrawTextLine(x, ty, text_[row], false);
+ DrawTextLine(kMarginWidth, ty, text_[row], false);
--row;
if (row < 0) row = text_rows_ - 1;
}