summaryrefslogtreecommitdiffstats
path: root/screen_ui.h
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-01-04 20:27:17 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-01-04 20:27:17 +0100
commit74e0ecb25bda6a1c01355d22e3e20bdb3226f3ea (patch)
tree2993d4b32a868c0c7d45fc293508f8a25de11b56 /screen_ui.h
parentMerge "updater: Refactor parse_range()." am: 466e1b396a am: 6502c50e4b (diff)
parentMerge "recovery: Fix the broken UI text." am: 56fc8fa376 (diff)
downloadandroid_bootable_recovery-74e0ecb25bda6a1c01355d22e3e20bdb3226f3ea.tar
android_bootable_recovery-74e0ecb25bda6a1c01355d22e3e20bdb3226f3ea.tar.gz
android_bootable_recovery-74e0ecb25bda6a1c01355d22e3e20bdb3226f3ea.tar.bz2
android_bootable_recovery-74e0ecb25bda6a1c01355d22e3e20bdb3226f3ea.tar.lz
android_bootable_recovery-74e0ecb25bda6a1c01355d22e3e20bdb3226f3ea.tar.xz
android_bootable_recovery-74e0ecb25bda6a1c01355d22e3e20bdb3226f3ea.tar.zst
android_bootable_recovery-74e0ecb25bda6a1c01355d22e3e20bdb3226f3ea.zip
Diffstat (limited to 'screen_ui.h')
-rw-r--r--screen_ui.h8
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();