diff options
author | Tao Bao <tbao@google.com> | 2017-01-04 20:11:23 +0100 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-04 20:11:24 +0100 |
commit | 56fc8fa376cb65a499fb38deaccf8b4f6076b034 (patch) | |
tree | d681555270b43c08d360207b0acb98829554e864 /screen_ui.h | |
parent | Merge "updater: Refactor parse_range()." (diff) | |
parent | recovery: Fix the broken UI text. (diff) | |
download | android_bootable_recovery-56fc8fa376cb65a499fb38deaccf8b4f6076b034.tar android_bootable_recovery-56fc8fa376cb65a499fb38deaccf8b4f6076b034.tar.gz android_bootable_recovery-56fc8fa376cb65a499fb38deaccf8b4f6076b034.tar.bz2 android_bootable_recovery-56fc8fa376cb65a499fb38deaccf8b4f6076b034.tar.lz android_bootable_recovery-56fc8fa376cb65a499fb38deaccf8b4f6076b034.tar.xz android_bootable_recovery-56fc8fa376cb65a499fb38deaccf8b4f6076b034.tar.zst android_bootable_recovery-56fc8fa376cb65a499fb38deaccf8b4f6076b034.zip |
Diffstat (limited to '')
-rw-r--r-- | screen_ui.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/screen_ui.h b/screen_ui.h index 38e2f0723..3ad64907e 100644 --- a/screen_ui.h +++ b/screen_ui.h @@ -20,6 +20,8 @@ #include <pthread.h> #include <stdio.h> +#include <string> + #include "ui.h" #include "minui/minui.h" @@ -29,8 +31,7 @@ class ScreenRecoveryUI : public RecoveryUI { public: ScreenRecoveryUI(); - bool Init() override; - void SetLocale(const char* locale); + bool Init(const std::string& locale) override; // overall recovery state ("background image") void SetBackground(Icon icon); @@ -71,8 +72,6 @@ class ScreenRecoveryUI : public RecoveryUI { protected: Icon currentIcon; - const char* locale; - // The scale factor from dp to pixels. 1.0 for mdpi, 4.0 for xxxhdpi. float density_; // The layout to use. @@ -135,7 +134,6 @@ class ScreenRecoveryUI : public RecoveryUI { int char_width_; int char_height_; pthread_mutex_t updateMutex; - bool rtl_locale; virtual bool InitTextParams(); |