diff options
author | Doug Zongker <dougz@android.com> | 2014-04-01 12:51:37 -0700 |
---|---|---|
committer | Doug Zongker <dougz@android.com> | 2014-04-01 12:56:07 -0700 |
commit | 7d4a68621aaa78554fcc37362fda6fc3fd91c83c (patch) | |
tree | 1f7be57e96803efdaa46c9200094c2977768ad33 | |
parent | 7e9aa2e4e9f49fbab2a53700cf0f21d56946ab9f (diff) | |
download | tilapia-7d4a68621aaa78554fcc37362fda6fc3fd91c83c.tar.gz |
remove custom recovery UI for tilapia
All its functionality is now in the default UI.
Change-Id: I3c4242f6cc03bc36fbff891ecc00902e0a410f14
-rw-r--r-- | BoardConfig.mk | 1 | ||||
-rw-r--r-- | recovery/Android.mk | 12 | ||||
-rw-r--r-- | recovery/recovery_ui.cpp | 83 |
3 files changed, 0 insertions, 96 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 5c47707..d1b87d9 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -32,7 +32,6 @@ USE_CAMERA_STUB := true USE_PROPRIETARY_AUDIO_EXTENSIONS := false -TARGET_RECOVERY_UI_LIB := librecovery_ui_tilapia TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_tilapia TARGET_RECOVERY_UPDATER_EXTRA_LIBS := libIMCdownload libPrgHandler diff --git a/recovery/Android.mk b/recovery/Android.mk index 354944b..9475448 100644 --- a/recovery/Android.mk +++ b/recovery/Android.mk @@ -1,18 +1,6 @@ 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_tilapia - -include $(BUILD_STATIC_LIBRARY) - -############################################################ -include $(CLEAR_VARS) - LOCAL_PREBUILT_LIBS := lib/libIMCdownload.a LOCAL_MODULE_TAGS := eng diff --git a/recovery/recovery_ui.cpp b/recovery/recovery_ui.cpp deleted file mode 100644 index 5924ec9..0000000 --- a/recovery/recovery_ui.cpp +++ /dev/null @@ -1,83 +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", - "wipe data/factory reset", - "wipe cache partition", - NULL }; - -class TilapiaDevice : public Device { - public: - TilapiaDevice() : - ui(new ScreenRecoveryUI) { - } - - 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 WIPE_DATA; - case 3: 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 TilapiaDevice; -} |