diff options
| author | Tao Bao <tbao@google.com> | 2017-01-04 20:31:48 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-04 20:31:48 +0100 |
| commit | 66edafb88fd9ada71b8c9120d10c07e18b3c9c96 (patch) | |
| tree | 0ff03f99e09e4f02e439512e27cbaffb8ea193e3 /screen_ui.h | |
| parent | Merge "Write aliases before ffs mount in recovery" (diff) | |
| parent | Merge "recovery: Fix the broken UI text." am: 56fc8fa376 am: 1227f6b841 (diff) | |
| download | android_bootable_recovery-66edafb88fd9ada71b8c9120d10c07e18b3c9c96.tar android_bootable_recovery-66edafb88fd9ada71b8c9120d10c07e18b3c9c96.tar.gz android_bootable_recovery-66edafb88fd9ada71b8c9120d10c07e18b3c9c96.tar.bz2 android_bootable_recovery-66edafb88fd9ada71b8c9120d10c07e18b3c9c96.tar.lz android_bootable_recovery-66edafb88fd9ada71b8c9120d10c07e18b3c9c96.tar.xz android_bootable_recovery-66edafb88fd9ada71b8c9120d10c07e18b3c9c96.tar.zst android_bootable_recovery-66edafb88fd9ada71b8c9120d10c07e18b3c9c96.zip | |
Diffstat (limited to 'screen_ui.h')
| -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(); |