diff options
author | Tao Bao <tbao@google.com> | 2017-01-31 23:03:10 -0800 |
---|---|---|
committer | Tao Bao <tbao@google.com> | 2017-09-11 12:19:32 -0700 |
commit | efb49add97cfda58c417ea4052cb6afb84c16c03 (patch) | |
tree | 2d27057a3a3bba0a9560bcded0b4eae001154c2b /ui.cpp | |
parent | 568644197fc05174e1c76dccba25ce30b2a83c4a (diff) | |
download | android_bootable_recovery-efb49add97cfda58c417ea4052cb6afb84c16c03.tar.gz android_bootable_recovery-efb49add97cfda58c417ea4052cb6afb84c16c03.tar.bz2 android_bootable_recovery-efb49add97cfda58c417ea4052cb6afb84c16c03.zip |
ui: Move locale and friends into ScreenRecoveryUI class.
Localized texts only make sense on devices with screens.
Test: Run fake OTA on angler; check the on-screen texts.
Change-Id: I3a644294c8b1f2056cfb78b2d61a598b8ddf2acf
Diffstat (limited to 'ui.cpp')
-rw-r--r-- | ui.cpp | 29 |
1 files changed, 2 insertions, 27 deletions
@@ -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; - } - } -} |