summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2012-01-10 10:19:58 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-10 10:19:58 -0800
commit413a4cf446b788f45851a6d5b8b1a369283fa3dc (patch)
treea970d27c2becf6b1aba7d8f213eef48158617e52
parentb1fef0d807b86dd730d3ee9b5b5a71afab1649d7 (diff)
parent982fc243e81bbf1aa7ab419cdcf988b69318c621 (diff)
downloaddevice_samsung_crespo-413a4cf446b788f45851a6d5b8b1a369283fa3dc.zip
device_samsung_crespo-413a4cf446b788f45851a6d5b8b1a369283fa3dc.tar.gz
device_samsung_crespo-413a4cf446b788f45851a6d5b8b1a369283fa3dc.tar.bz2
Merge "add sideload-from-adb command to recovery menu"
-rw-r--r--recovery/recovery_ui.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/recovery/recovery_ui.cpp b/recovery/recovery_ui.cpp
index 4c615f8..4f97407 100644
--- a/recovery/recovery_ui.cpp
+++ b/recovery/recovery_ui.cpp
@@ -29,13 +29,12 @@ const char* HEADERS[] = { "Volume up/down to move highlight;",
NULL };
const char* ITEMS[] = { "reboot system now",
+ "apply update from ADB",
"apply update from /sdcard",
"wipe data/factory reset",
"wipe cache partition",
NULL };
-
-
class CrespoUI : public ScreenRecoveryUI {
public:
CrespoUI() :
@@ -91,9 +90,10 @@ class CrespoDevice : public Device {
BuiltinAction InvokeMenuItem(int menu_position) {
switch (menu_position) {
case 0: return REBOOT;
- case 1: return APPLY_EXT;
- case 2: return WIPE_DATA;
- case 3: return WIPE_CACHE;
+ 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;
}
}