diff options
| -rwxr-xr-x | BoardConfig.mk | 1 | ||||
| -rw-r--r-- | recovery/Android.mk | 11 | ||||
| -rw-r--r-- | recovery/recovery_ui.cpp | 111 |
3 files changed, 0 insertions, 123 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index d264f24..fb54493 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -196,7 +196,6 @@ BOARD_SEPOLICY_UNION += \ RECOVERY_FSTAB_VERSION := 2 TARGET_RECOVERY_FSTAB = $(DEVICE_FOLDER)/rootdir/fstab.tuna TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" -TARGET_RECOVERY_UI_LIB := librecovery_ui_tuna BOARD_RECOVERY_SWIPE := true BOARD_HAS_NO_SELECT_BUTTON := true BOARD_USE_CUSTOM_RECOVERY_FONT := \"roboto_15x24.h\" diff --git a/recovery/Android.mk b/recovery/Android.mk index 7da4ba4..bb6aa45 100644 --- a/recovery/Android.mk +++ b/recovery/Android.mk @@ -3,17 +3,6 @@ ifneq (,$(findstring $(TARGET_DEVICE),tuna toro toroplus maguro)) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := eng -LOCAL_C_INCLUDES += bootable/recovery -LOCAL_SRC_FILES := recovery_ui.cpp - -# should match TARGET_RECOVERY_UI_LIB set in BoardConfig.mk -LOCAL_MODULE := librecovery_ui_tuna - -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) - # Edify extension functions for doing bootloader updates on Tuna devices. LOCAL_MODULE_TAGS := optional diff --git a/recovery/recovery_ui.cpp b/recovery/recovery_ui.cpp deleted file mode 100644 index 0c8b8f9..0000000 --- a/recovery/recovery_ui.cpp +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include <linux/input.h> -#include <sys/stat.h> -#include <errno.h> -#include <string.h> - -#include "common.h" -#include "device.h" -#include "screen_ui.h" - -const char* HEADERS[] = { "Volume up/down to move highlight;", - "power button to select.", - "", - NULL }; - -const char* ITEMS[] = { "reboot system now", - "apply update from ADB", - "apply update from USB drive", - "wipe data/factory reset", - "wipe cache partition", - NULL }; - -class TunaUI : public ScreenRecoveryUI { - public: - TunaUI() : - consecutive_power_keys(0) { - } - - virtual KeyAction CheckKey(int key) { - if (IsKeyPressed(KEY_POWER) && key == KEY_VOLUMEUP) { - return TOGGLE; - } - if (key == KEY_POWER) { - ++consecutive_power_keys; - if (consecutive_power_keys >= 7) { - return REBOOT; - } - } else { - consecutive_power_keys = 0; - } - return ENQUEUE; - } - - private: - int consecutive_power_keys; -}; - - -class TunaDevice : public Device { - public: - TunaDevice() : - ui(new TunaUI) { - } - - RecoveryUI* GetUI() { return ui; } - - int HandleMenuKey(int key_code, int visible) { - if (visible) { - switch (key_code) { - case KEY_DOWN: - case KEY_VOLUMEDOWN: - return kHighlightDown; - - case KEY_UP: - case KEY_VOLUMEUP: - return kHighlightUp; - - case KEY_POWER: - return kInvokeItem; - } - } - - return kNoAction; - } - - BuiltinAction InvokeMenuItem(int menu_position) { - switch (menu_position) { - case 0: return REBOOT; - case 1: return APPLY_ADB_SIDELOAD; - case 2: return APPLY_EXT; - case 3: return WIPE_DATA; - case 4: return WIPE_CACHE; - default: return NO_ACTION; - } - } - - const char* const* GetMenuHeaders() { return HEADERS; } - const char* const* GetMenuItems() { return ITEMS; } - - private: - RecoveryUI* ui; -}; - -Device* make_device() { - return new TunaDevice; -} |