diff options
author | Tao Bao <tbao@google.com> | 2017-09-02 01:01:26 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-02 01:01:26 +0200 |
commit | 036dec394455c6a82025a0437177940a0008990a (patch) | |
tree | 3ccc1c4a7b1669a660e16bda0e87450ec815debe | |
parent | Merge "wear_ui: Remove backgroundIcon." am: 6e426f2b76 am: 3650e7c19b (diff) | |
parent | Merge "wear_ui: Remove PrintOnScreenOnly() and PrintV()." am: 8c753f6253 (diff) | |
download | android_bootable_recovery-036dec394455c6a82025a0437177940a0008990a.tar android_bootable_recovery-036dec394455c6a82025a0437177940a0008990a.tar.gz android_bootable_recovery-036dec394455c6a82025a0437177940a0008990a.tar.bz2 android_bootable_recovery-036dec394455c6a82025a0437177940a0008990a.tar.lz android_bootable_recovery-036dec394455c6a82025a0437177940a0008990a.tar.xz android_bootable_recovery-036dec394455c6a82025a0437177940a0008990a.tar.zst android_bootable_recovery-036dec394455c6a82025a0437177940a0008990a.zip |
-rw-r--r-- | wear_ui.cpp | 34 | ||||
-rw-r--r-- | wear_ui.h | 3 |
2 files changed, 1 insertions, 36 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp index b9289d366..670050a0b 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -32,8 +32,8 @@ #include <vector> #include <android-base/properties.h> -#include <android-base/strings.h> #include <android-base/stringprintf.h> +#include <android-base/strings.h> #include <minui/minui.h> #include "common.h" @@ -312,35 +312,3 @@ void WearRecoveryUI::ShowFile(const char* filename) { ShowFile(fp); fclose(fp); } - -void WearRecoveryUI::PrintOnScreenOnly(const char *fmt, ...) { - va_list ap; - va_start(ap, fmt); - PrintV(fmt, false, ap); - va_end(ap); -} - -void WearRecoveryUI::PrintV(const char* fmt, bool copy_to_stdout, va_list ap) { - std::string str; - android::base::StringAppendV(&str, fmt, ap); - - if (copy_to_stdout) { - fputs(str.c_str(), stdout); - } - - pthread_mutex_lock(&updateMutex); - if (text_rows_ > 0 && text_cols_ > 0) { - for (const char* ptr = str.c_str(); *ptr != '\0'; ++ptr) { - if (*ptr == '\n' || text_col_ >= text_cols_) { - text_[text_row_][text_col_] = '\0'; - text_col_ = 0; - text_row_ = (text_row_ + 1) % text_rows_; - if (text_row_ == text_top_) text_top_ = (text_top_ + 1) % text_rows_; - } - if (*ptr != '\n') text_[text_row_][text_col_++] = *ptr; - } - text_[text_row_][text_col_] = '\0'; - update_screen_locked(); - } - pthread_mutex_unlock(&updateMutex); -} @@ -29,7 +29,6 @@ class WearRecoveryUI : public ScreenRecoveryUI { // printing messages void Print(const char* fmt, ...) override; - void PrintOnScreenOnly(const char* fmt, ...) override __printflike(2, 3); void ShowFile(const char* filename) override; void ShowFile(FILE* fp) override; @@ -50,8 +49,6 @@ class WearRecoveryUI : public ScreenRecoveryUI { void update_progress_locked() override; - void PrintV(const char*, bool, va_list) override; - private: void draw_background_locked() override; void draw_screen_locked() override; |