summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrashant Malani <pmalani@google.com>2016-03-09 01:41:54 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-03-09 01:41:54 +0100
commitb2085d9ce26c4cdc046708e9d3a4843bbbdcf467 (patch)
tree78fd34f1f37da315bea6bdedfa6dbb837488db30
parentMerge "Reboot and retry on I/O errors" am: 94dc34148c am: 90f01a4203 (diff)
parentrecovery: Begin refactor of WearUI to use ScreenRecoveryUI (diff)
downloadandroid_bootable_recovery-b2085d9ce26c4cdc046708e9d3a4843bbbdcf467.tar
android_bootable_recovery-b2085d9ce26c4cdc046708e9d3a4843bbbdcf467.tar.gz
android_bootable_recovery-b2085d9ce26c4cdc046708e9d3a4843bbbdcf467.tar.bz2
android_bootable_recovery-b2085d9ce26c4cdc046708e9d3a4843bbbdcf467.tar.lz
android_bootable_recovery-b2085d9ce26c4cdc046708e9d3a4843bbbdcf467.tar.xz
android_bootable_recovery-b2085d9ce26c4cdc046708e9d3a4843bbbdcf467.tar.zst
android_bootable_recovery-b2085d9ce26c4cdc046708e9d3a4843bbbdcf467.zip
-rw-r--r--wear_ui.cpp27
-rw-r--r--wear_ui.h10
2 files changed, 2 insertions, 35 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 8a57cfffa..65bcd8494 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -16,9 +16,7 @@
#include <errno.h>
#include <fcntl.h>
-#include <pthread.h>
#include <stdarg.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
@@ -31,9 +29,7 @@
#include "common.h"
#include "device.h"
-#include "minui/minui.h"
#include "wear_ui.h"
-#include "ui.h"
#include "cutils/properties.h"
#include "android-base/strings.h"
#include "android-base/stringprintf.h"
@@ -370,29 +366,6 @@ void WearRecoveryUI::Init()
RecoveryUI::Init();
}
-void WearRecoveryUI::SetLocale(const char* locale) {
- if (locale) {
- char* lang = strdup(locale);
- for (char* p = lang; *p; ++p) {
- if (*p == '_') {
- *p = '\0';
- break;
- }
- }
-
- // A bit cheesy: keep an explicit list of supported languages
- // that are RTL.
- if (strcmp(lang, "ar") == 0 || // Arabic
- strcmp(lang, "fa") == 0 || // Persian (Farsi)
- strcmp(lang, "he") == 0 || // Hebrew (new language code)
- strcmp(lang, "iw") == 0 || // Hebrew (old language code)
- strcmp(lang, "ur") == 0) { // Urdu
- rtl_locale = true;
- }
- free(lang);
- }
-}
-
void WearRecoveryUI::SetBackground(Icon icon)
{
pthread_mutex_lock(&updateMutex);
diff --git a/wear_ui.h b/wear_ui.h
index 768141ccc..35ea51660 100644
--- a/wear_ui.h
+++ b/wear_ui.h
@@ -17,19 +17,13 @@
#ifndef RECOVERY_WEAR_UI_H
#define RECOVERY_WEAR_UI_H
-#include <pthread.h>
-#include <stdio.h>
+#include "screen_ui.h"
-#include "ui.h"
-#include "minui/minui.h"
-
-class WearRecoveryUI : public RecoveryUI {
+class WearRecoveryUI : public ScreenRecoveryUI {
public:
WearRecoveryUI();
void Init();
- void SetLocale(const char* locale);
-
// overall recovery state ("background image")
void SetBackground(Icon icon);