summaryrefslogtreecommitdiffstats
path: root/ui.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-09-12 00:03:40 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-09-12 00:03:40 +0200
commit547d5fd559350376cfd577fcd0dc7d4c35a23911 (patch)
treefc60cc302ea1176a5f987b8a9fdd251f54d69707 /ui.cpp
parentMerge "ui: Remove text_top_." am: 568644197f (diff)
parentMerge "ui: Move locale and friends into ScreenRecoveryUI class." (diff)
downloadandroid_bootable_recovery-547d5fd559350376cfd577fcd0dc7d4c35a23911.tar
android_bootable_recovery-547d5fd559350376cfd577fcd0dc7d4c35a23911.tar.gz
android_bootable_recovery-547d5fd559350376cfd577fcd0dc7d4c35a23911.tar.bz2
android_bootable_recovery-547d5fd559350376cfd577fcd0dc7d4c35a23911.tar.lz
android_bootable_recovery-547d5fd559350376cfd577fcd0dc7d4c35a23911.tar.xz
android_bootable_recovery-547d5fd559350376cfd577fcd0dc7d4c35a23911.tar.zst
android_bootable_recovery-547d5fd559350376cfd577fcd0dc7d4c35a23911.zip
Diffstat (limited to 'ui.cpp')
-rw-r--r--ui.cpp29
1 files changed, 2 insertions, 27 deletions
diff --git a/ui.cpp b/ui.cpp
index e80d7ed04..baf6d1080 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -50,9 +50,7 @@ static constexpr const char* BRIGHTNESS_FILE = "/sys/class/leds/lcd-backlight/br
static constexpr const char* MAX_BRIGHTNESS_FILE = "/sys/class/leds/lcd-backlight/max_brightness";
RecoveryUI::RecoveryUI()
- : locale_(""),
- rtl_locale_(false),
- brightness_normal_(50),
+ : brightness_normal_(50),
brightness_dimmed_(25),
touch_screen_allowed_(false),
kTouchLowThreshold(RECOVERY_UI_TOUCH_LOW_THRESHOLD),
@@ -132,10 +130,7 @@ bool RecoveryUI::InitScreensaver() {
return true;
}
-bool RecoveryUI::Init(const std::string& locale) {
- // Set up the locale info.
- SetLocale(locale);
-
+bool RecoveryUI::Init(const std::string& /* locale */) {
ev_init(std::bind(&RecoveryUI::OnInputEvent, this, std::placeholders::_1, std::placeholders::_2),
touch_screen_allowed_);
@@ -574,23 +569,3 @@ void RecoveryUI::SetEnableReboot(bool enabled) {
enable_reboot = enabled;
pthread_mutex_unlock(&key_queue_mutex);
}
-
-void RecoveryUI::SetLocale(const std::string& new_locale) {
- this->locale_ = new_locale;
- this->rtl_locale_ = false;
-
- if (!new_locale.empty()) {
- size_t underscore = new_locale.find('_');
- // lang has the language prefix prior to '_', or full string if '_' doesn't exist.
- std::string lang = new_locale.substr(0, underscore);
-
- // A bit cheesy: keep an explicit list of supported RTL languages.
- if (lang == "ar" || // Arabic
- lang == "fa" || // Persian (Farsi)
- lang == "he" || // Hebrew (new language code)
- lang == "iw" || // Hebrew (old language code)
- lang == "ur") { // Urdu
- rtl_locale_ = true;
- }
- }
-}