summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-07-13 22:52:18 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-07-13 22:52:18 +0200
commit0d24d9cbed7b4f3259b9d0ebc2914829eb0b67aa (patch)
tree1074c0402a50da4f8a5a4b07475f4b75989453ac
parentMerge "Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s ours am: 7e05669aba -s ours" into oc-dr1-dev-plus-aosp (diff)
parentMerge "Fix the missing char when showing recovery logs." am: 8155a8ba74 am: c61bbe158e (diff)
downloadandroid_bootable_recovery-0d24d9cbed7b4f3259b9d0ebc2914829eb0b67aa.tar
android_bootable_recovery-0d24d9cbed7b4f3259b9d0ebc2914829eb0b67aa.tar.gz
android_bootable_recovery-0d24d9cbed7b4f3259b9d0ebc2914829eb0b67aa.tar.bz2
android_bootable_recovery-0d24d9cbed7b4f3259b9d0ebc2914829eb0b67aa.tar.lz
android_bootable_recovery-0d24d9cbed7b4f3259b9d0ebc2914829eb0b67aa.tar.xz
android_bootable_recovery-0d24d9cbed7b4f3259b9d0ebc2914829eb0b67aa.tar.zst
android_bootable_recovery-0d24d9cbed7b4f3259b9d0ebc2914829eb0b67aa.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;
}