tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "wear_ui: Remove PrintOnScreenOnly() and PrintV()."

Browse source
This commit is contained in:
Tao Bao 2017-09-01 22:26:31 +00:00 committed by Gerrit Code Review
commit 8c753f6253
2 changed files with 1 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
wear_ui.cpp
View file

@ -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);
}

3
wear_ui.h
View file

@ -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;