summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Android.mk14
-rw-r--r--gui/devices/1024x600/res/images/exclamation200.pngbin0 -> 5260 bytes
-rwxr-xr-xgui/devices/1024x600/res/ui.xml16
-rw-r--r--gui/devices/1024x768/res/images/exclamation200.pngbin0 -> 5260 bytes
-rw-r--r--gui/devices/1024x768/res/ui.xml16
-rw-r--r--gui/devices/1280x800/res/images/exclamation200.pngbin0 -> 5260 bytes
-rw-r--r--gui/devices/1280x800/res/ui.xml16
-rw-r--r--gui/devices/1920x1200/res/images/exclamation400.pngbin0 -> 11295 bytes
-rw-r--r--gui/devices/1920x1200/res/ui.xml16
-rw-r--r--gui/devices/320x480/res/images/exclamation150.pngbin0 -> 6460 bytes
-rw-r--r--gui/devices/320x480/res/ui.xml18
-rw-r--r--gui/devices/480x800/res/images/exclamation200.pngbin0 -> 5260 bytes
-rw-r--r--gui/devices/480x800/res/ui.xml18
-rw-r--r--gui/devices/480x854/res/images/exclamation200.pngbin0 -> 5260 bytes
-rw-r--r--gui/devices/480x854/res/ui.xml18
-rw-r--r--gui/devices/540x960/res/images/exclamation300.pngbin0 -> 13488 bytes
-rw-r--r--gui/devices/540x960/res/ui.xml18
-rw-r--r--gui/devices/720x1280/res/ui.xml16
-rw-r--r--gui/devices/800x1280/res/images/exclamation400.pngbin0 -> 11295 bytes
-rwxr-xr-xgui/devices/800x1280/res/ui.xml18
-rw-r--r--gui/devices/800x480/res/images/exclamation150.pngbin0 -> 6460 bytes
-rwxr-xr-xgui/devices/800x480/res/ui.xml16
-rw-r--r--partition.cpp8
-rw-r--r--prebuilt/Android.mk9
-rwxr-xr-xprebuilt/bbinstall.sh14
-rw-r--r--recovery.cpp2
-rw-r--r--variables.h2
27 files changed, 200 insertions, 35 deletions
diff --git a/Android.mk b/Android.mk
index 7187ae73e..f7d75f94c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -205,22 +205,8 @@ ifeq ($(TW_INCLUDE_JB_CRYPTO), true)
LOCAL_C_INCLUDES += system/extras/ext4_utils external/openssl/include
endif
-
include $(BUILD_EXECUTABLE)
-# Create busybox symlinks... gzip and gunzip are excluded because those need to link to pigz instead
-BUSYBOX_LINKS := $(shell cat external/busybox/busybox-full.links)
-exclude := tune2fs mke2fs mkdosfs gzip gunzip
-RECOVERY_BUSYBOX_SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(filter-out $(exclude),$(notdir $(BUSYBOX_LINKS))))
-$(RECOVERY_BUSYBOX_SYMLINKS): BUSYBOX_BINARY := busybox
-$(RECOVERY_BUSYBOX_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
- @echo "Symlink: $@ -> $(BUSYBOX_BINARY)"
- @mkdir -p $(dir $@)
- @rm -rf $@
- $(hide) ln -sf $(BUSYBOX_BINARY) $@
-
-ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_BUSYBOX_SYMLINKS)
-
include $(CLEAR_VARS)
LOCAL_MODULE := verifier_test
LOCAL_FORCE_STATIC_EXECUTABLE := true
diff --git a/gui/devices/1024x600/res/images/exclamation200.png b/gui/devices/1024x600/res/images/exclamation200.png
new file mode 100644
index 000000000..96258a1c3
--- /dev/null
+++ b/gui/devices/1024x600/res/images/exclamation200.png
Binary files differ
diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml
index 7a0bbd00d..7fcb75aa8 100755
--- a/gui/devices/1024x600/res/ui.xml
+++ b/gui/devices/1024x600/res/ui.xml
@@ -41,6 +41,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
+ <resource name="exclamation" type="image" filename="exclamation200" />
</resources>
<variables>
@@ -170,6 +171,8 @@
<variable name="terminal_text_y" value="307" />
<variable name="terminal_button_y" value="298" />
<variable name="terminal_input_width" value="775" />
+ <variable name="exclamation_x" value="412" />
+ <variable name="exclamation_y" value="200" />
</variables>
<templates>
@@ -822,6 +825,7 @@
<action function="set">tw_has_cancel=0</action>
<action function="set">tw_cancel_action=</action>
<action function="set">tw_cancel_param=</action>
+ <action function="set">tw_show_exclamation=0</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -829,6 +833,14 @@
<page name="confirm_action">
<object type="template" name="header" />
+ <object type="button">
+ <condition var1="tw_show_exclamation" var2="1" />
+ <placement x="%exclamation_x%" y="%exclamation_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text></text>
+ <image resource="exclamation" />
+ </object>
+
<object type="text" color="%text_color%">
<font resource="font" />
<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -855,7 +867,7 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row8_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row12_text_y%" placement="5" />
<text>Press back button to cancel.</text>
</object>
@@ -1575,9 +1587,11 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_text1=Format Data? (This wipes all media</action>
<action function="set">tw_text2=including backups & removes encryption)</action>
+ <action function="set">tw_text3=Most of the time you do not need to do this.</action>
<action function="set">tw_action_text1=Formatting Data...</action>
<action function="set">tw_complete_text1=Data Format Complete</action>
<action function="set">tw_slider_text=Swipe to Format</action>
+ <action function="set">tw_show_exclamation=1</action>
<action function="page">confirm_action</action>
</actions>
</object>
diff --git a/gui/devices/1024x768/res/images/exclamation200.png b/gui/devices/1024x768/res/images/exclamation200.png
new file mode 100644
index 000000000..96258a1c3
--- /dev/null
+++ b/gui/devices/1024x768/res/images/exclamation200.png
Binary files differ
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
index cc9701ba1..596c320e1 100644
--- a/gui/devices/1024x768/res/ui.xml
+++ b/gui/devices/1024x768/res/ui.xml
@@ -41,6 +41,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
+ <resource name="exclamation" type="image" filename="exclamation200" />
</resources>
<variables>
@@ -170,6 +171,8 @@
<variable name="terminal_text_y" value="368" />
<variable name="terminal_button_y" value="358" />
<variable name="terminal_input_width" value="775" />
+ <variable name="exclamation_x" value="412" />
+ <variable name="exclamation_y" value="200" />
</variables>
<templates>
@@ -822,6 +825,7 @@
<action function="set">tw_has_cancel=0</action>
<action function="set">tw_cancel_action=</action>
<action function="set">tw_cancel_param=</action>
+ <action function="set">tw_show_exclamation=0</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -829,6 +833,14 @@
<page name="confirm_action">
<object type="template" name="header" />
+ <object type="button">
+ <condition var1="tw_show_exclamation" var2="1" />
+ <placement x="%exclamation_x%" y="%exclamation_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text></text>
+ <image resource="exclamation" />
+ </object>
+
<object type="text" color="%text_color%">
<font resource="font" />
<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -855,7 +867,7 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row8_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row12_text_y%" placement="5" />
<text>Press back button to cancel.</text>
</object>
@@ -1575,9 +1587,11 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_text1=Format Data? (This wipes all media</action>
<action function="set">tw_text2=including backups & removes encryption)</action>
+ <action function="set">tw_text3=Most of the time you do not need to do this.</action>
<action function="set">tw_action_text1=Formatting Data...</action>
<action function="set">tw_complete_text1=Data Format Complete</action>
<action function="set">tw_slider_text=Swipe to Format</action>
+ <action function="set">tw_show_exclamation=1</action>
<action function="page">confirm_action</action>
</actions>
</object>
diff --git a/gui/devices/1280x800/res/images/exclamation200.png b/gui/devices/1280x800/res/images/exclamation200.png
new file mode 100644
index 000000000..96258a1c3
--- /dev/null
+++ b/gui/devices/1280x800/res/images/exclamation200.png
Binary files differ
diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml
index 2e5b32905..4b06c0433 100644
--- a/gui/devices/1280x800/res/ui.xml
+++ b/gui/devices/1280x800/res/ui.xml
@@ -41,6 +41,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
+ <resource name="exclamation" type="image" filename="exclamation200" />
</resources>
<variables>
@@ -170,6 +171,8 @@
<variable name="terminal_text_y" value="368" />
<variable name="terminal_button_y" value="358" />
<variable name="terminal_input_width" value="1031" />
+ <variable name="exclamation_x" value="540" />
+ <variable name="exclamation_y" value="200" />
</variables>
<templates>
@@ -822,6 +825,7 @@
<action function="set">tw_has_cancel=0</action>
<action function="set">tw_cancel_action=</action>
<action function="set">tw_cancel_param=</action>
+ <action function="set">tw_show_exclamation=0</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -829,6 +833,14 @@
<page name="confirm_action">
<object type="template" name="header" />
+ <object type="button">
+ <condition var1="tw_show_exclamation" var2="1" />
+ <placement x="%exclamation_x%" y="%exclamation_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text></text>
+ <image resource="exclamation" />
+ </object>
+
<object type="text" color="%text_color%">
<font resource="font" />
<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -855,7 +867,7 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row8_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row12_text_y%" placement="5" />
<text>Press back button to cancel.</text>
</object>
@@ -1575,9 +1587,11 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_text1=Format Data? (This wipes all media</action>
<action function="set">tw_text2=including backups & removes encryption)</action>
+ <action function="set">tw_text3=Most of the time you do not need to do this.</action>
<action function="set">tw_action_text1=Formatting Data...</action>
<action function="set">tw_complete_text1=Data Format Complete</action>
<action function="set">tw_slider_text=Swipe to Format</action>
+ <action function="set">tw_show_exclamation=1</action>
<action function="page">confirm_action</action>
</actions>
</object>
diff --git a/gui/devices/1920x1200/res/images/exclamation400.png b/gui/devices/1920x1200/res/images/exclamation400.png
new file mode 100644
index 000000000..f3a8aabb6
--- /dev/null
+++ b/gui/devices/1920x1200/res/images/exclamation400.png
Binary files differ
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 17ccfe922..6ff72d643 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -41,6 +41,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
+ <resource name="exclamation" type="image" filename="exclamation400" />
</resources>
<variables>
@@ -170,6 +171,8 @@
<variable name="terminal_text_y" value="624" />
<variable name="terminal_button_y" value="615" />
<variable name="terminal_input_width" value="1550" />
+ <variable name="exclamation_x" value="760" />
+ <variable name="exclamation_y" value="260" />
</variables>
<templates>
@@ -822,6 +825,7 @@
<action function="set">tw_has_cancel=0</action>
<action function="set">tw_cancel_action=</action>
<action function="set">tw_cancel_param=</action>
+ <action function="set">tw_show_exclamation=0</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -829,6 +833,14 @@
<page name="confirm_action">
<object type="template" name="header" />
+ <object type="button">
+ <condition var1="tw_show_exclamation" var2="1" />
+ <placement x="%exclamation_x%" y="%exclamation_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text></text>
+ <image resource="exclamation" />
+ </object>
+
<object type="text" color="%text_color%">
<font resource="font" />
<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -855,7 +867,7 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row8_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row12_text_y%" placement="5" />
<text>Press back button to cancel.</text>
</object>
@@ -1575,9 +1587,11 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_text1=Format Data? (This wipes all media</action>
<action function="set">tw_text2=including backups & removes encryption)</action>
+ <action function="set">tw_text3=Most of the time you do not need to do this.</action>
<action function="set">tw_action_text1=Formatting Data...</action>
<action function="set">tw_complete_text1=Data Format Complete</action>
<action function="set">tw_slider_text=Swipe to Format</action>
+ <action function="set">tw_show_exclamation=1</action>
<action function="page">confirm_action</action>
</actions>
</object>
diff --git a/gui/devices/320x480/res/images/exclamation150.png b/gui/devices/320x480/res/images/exclamation150.png
new file mode 100644
index 000000000..6e05987c1
--- /dev/null
+++ b/gui/devices/320x480/res/images/exclamation150.png
Binary files differ
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
index efa980ac4..a98165b4a 100644
--- a/gui/devices/320x480/res/ui.xml
+++ b/gui/devices/320x480/res/ui.xml
@@ -39,6 +39,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
+ <resource name="exclamation" type="image" filename="exclamation150" />
</resources>
<variables>
@@ -155,6 +156,8 @@
<variable name="row_dst_text_y" value="256" />
<variable name="row_offset_text_y" value="275" />
<variable name="row_offset_medium_y" value="303" />
+ <variable name="exclamation_x" value="85" />
+ <variable name="exclamation_y" value="165" />
</variables>
<templates>
@@ -794,6 +797,7 @@
<action function="set">tw_has_cancel=0</action>
<action function="set">tw_cancel_action=</action>
<action function="set">tw_cancel_param=</action>
+ <action function="set">tw_show_exclamation=0</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -801,6 +805,14 @@
<page name="confirm_action">
<object type="template" name="header" />
+ <object type="button">
+ <condition var1="tw_show_exclamation" var2="1" />
+ <placement x="%exclamation_x%" y="%exclamation_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text></text>
+ <image resource="exclamation" />
+ </object>
+
<object type="text" color="%text_color%">
<font resource="font" />
<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -827,7 +839,7 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row10_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row15_text_y%" placement="5" />
<text>Press back button to cancel.</text>
</object>
@@ -1153,11 +1165,13 @@
<action function="set">tw_has_action2=1</action>
<action function="set">tw_action2=set</action>
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
- <action function="set">tw_text1=Format Data? (This wipes all media</action>
+ <action function="set">tw_text1=Format Data? (This wipes all internal storage</action>
<action function="set">tw_text2=including backups & removes encryption)</action>
+ <action function="set">tw_text3=Most of the time you do not need to do this.</action>
<action function="set">tw_action_text1=Formatting Data...</action>
<action function="set">tw_complete_text1=Data Format Complete</action>
<action function="set">tw_slider_text=Swipe to Format</action>
+ <action function="set">tw_show_exclamation=1</action>
<action function="page">confirm_action</action>
</actions>
</object>
diff --git a/gui/devices/480x800/res/images/exclamation200.png b/gui/devices/480x800/res/images/exclamation200.png
new file mode 100644
index 000000000..96258a1c3
--- /dev/null
+++ b/gui/devices/480x800/res/images/exclamation200.png
Binary files differ
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index 435efb079..d348f3875 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -39,6 +39,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
+ <resource name="exclamation" type="image" filename="exclamation200" />
</resources>
<variables>
@@ -154,6 +155,8 @@
<variable name="row_dst_text_y" value="440" />
<variable name="row_offset_text_y" value="480" />
<variable name="row_offset_medium_y" value="505" />
+ <variable name="exclamation_x" value="140" />
+ <variable name="exclamation_y" value="300" />
</variables>
<templates>
@@ -793,6 +796,7 @@
<action function="set">tw_has_cancel=0</action>
<action function="set">tw_cancel_action=</action>
<action function="set">tw_cancel_param=</action>
+ <action function="set">tw_show_exclamation=0</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -800,6 +804,14 @@
<page name="confirm_action">
<object type="template" name="header" />
+ <object type="button">
+ <condition var1="tw_show_exclamation" var2="1" />
+ <placement x="%exclamation_x%" y="%exclamation_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text></text>
+ <image resource="exclamation" />
+ </object>
+
<object type="text" color="%text_color%">
<font resource="font" />
<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -826,7 +838,7 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row10_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row15_text_y%" placement="5" />
<text>Press back button to cancel.</text>
</object>
@@ -1152,11 +1164,13 @@
<action function="set">tw_has_action2=1</action>
<action function="set">tw_action2=set</action>
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
- <action function="set">tw_text1=Format Data? (This wipes all media</action>
+ <action function="set">tw_text1=Format Data? (This wipes all internal storage</action>
<action function="set">tw_text2=including backups & removes encryption)</action>
+ <action function="set">tw_text3=Most of the time you do not need to do this.</action>
<action function="set">tw_action_text1=Formatting Data...</action>
<action function="set">tw_complete_text1=Data Format Complete</action>
<action function="set">tw_slider_text=Swipe to Format</action>
+ <action function="set">tw_show_exclamation=1</action>
<action function="page">confirm_action</action>
</actions>
</object>
diff --git a/gui/devices/480x854/res/images/exclamation200.png b/gui/devices/480x854/res/images/exclamation200.png
new file mode 100644
index 000000000..96258a1c3
--- /dev/null
+++ b/gui/devices/480x854/res/images/exclamation200.png
Binary files differ
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml
index ff0035723..7badfd3e7 100644
--- a/gui/devices/480x854/res/ui.xml
+++ b/gui/devices/480x854/res/ui.xml
@@ -39,6 +39,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
+ <resource name="exclamation" type="image" filename="exclamation200" />
</resources>
<variables>
@@ -153,6 +154,8 @@
<variable name="row_dst_text_y" value="440" />
<variable name="row_offset_text_y" value="480" />
<variable name="row_offset_medium_y" value="505" />
+ <variable name="exclamation_x" value="140" />
+ <variable name="exclamation_y" value="300" />
</variables>
<templates>
@@ -792,6 +795,7 @@
<action function="set">tw_has_cancel=0</action>
<action function="set">tw_cancel_action=</action>
<action function="set">tw_cancel_param=</action>
+ <action function="set">tw_show_exclamation=0</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -799,6 +803,14 @@
<page name="confirm_action">
<object type="template" name="header" />
+ <object type="button">
+ <condition var1="tw_show_exclamation" var2="1" />
+ <placement x="%exclamation_x%" y="%exclamation_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text></text>
+ <image resource="exclamation" />
+ </object>
+
<object type="text" color="%text_color%">
<font resource="font" />
<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -825,7 +837,7 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row10_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row15_text_y%" placement="5" />
<text>Press back button to cancel.</text>
</object>
@@ -1151,11 +1163,13 @@
<action function="set">tw_has_action2=1</action>
<action function="set">tw_action2=set</action>
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
- <action function="set">tw_text1=Format Data? (This wipes all media</action>
+ <action function="set">tw_text1=Format Data? (This wipes all internal storage</action>
<action function="set">tw_text2=including backups & removes encryption)</action>
+ <action function="set">tw_text3=Most of the time you do not need to do this.</action>
<action function="set">tw_action_text1=Formatting Data...</action>
<action function="set">tw_complete_text1=Data Format Complete</action>
<action function="set">tw_slider_text=Swipe to Format</action>
+ <action function="set">tw_show_exclamation=1</action>
<action function="page">confirm_action</action>
</actions>
</object>
diff --git a/gui/devices/540x960/res/images/exclamation300.png b/gui/devices/540x960/res/images/exclamation300.png
new file mode 100644
index 000000000..1ac400d11
--- /dev/null
+++ b/gui/devices/540x960/res/images/exclamation300.png
Binary files differ
diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml
index ca008d5ab..af8ea0d4d 100644
--- a/gui/devices/540x960/res/ui.xml
+++ b/gui/devices/540x960/res/ui.xml
@@ -39,6 +39,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
+ <resource name="exclamation" type="image" filename="exclamation300" />
</resources>
<variables>
@@ -154,6 +155,8 @@
<variable name="row_dst_text_y" value="540" />
<variable name="row_offset_text_y" value="580" />
<variable name="row_offset_medium_y" value="630" />
+ <variable name="exclamation_x" value="120" />
+ <variable name="exclamation_y" value="300" />
</variables>
<templates>
@@ -793,6 +796,7 @@
<action function="set">tw_has_cancel=0</action>
<action function="set">tw_cancel_action=</action>
<action function="set">tw_cancel_param=</action>
+ <action function="set">tw_show_exclamation=0</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -800,6 +804,14 @@
<page name="confirm_action">
<object type="template" name="header" />
+ <object type="button">
+ <condition var1="tw_show_exclamation" var2="1" />
+ <placement x="%exclamation_x%" y="%exclamation_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text></text>
+ <image resource="exclamation" />
+ </object>
+
<object type="text" color="%text_color%">
<font resource="font" />
<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -826,7 +838,7 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row10_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row15_text_y%" placement="5" />
<text>Press back button to cancel.</text>
</object>
@@ -1152,11 +1164,13 @@
<action function="set">tw_has_action2=1</action>
<action function="set">tw_action2=set</action>
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
- <action function="set">tw_text1=Format Data? (This wipes all media</action>
+ <action function="set">tw_text1=Format Data? (This wipes all internal storage</action>
<action function="set">tw_text2=including backups & removes encryption)</action>
+ <action function="set">tw_text3=Most of the time you do not need to do this.</action>
<action function="set">tw_action_text1=Formatting Data...</action>
<action function="set">tw_complete_text1=Data Format Complete</action>
<action function="set">tw_slider_text=Swipe to Format</action>
+ <action function="set">tw_show_exclamation=1</action>
<action function="page">confirm_action</action>
</actions>
</object>
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
index d0973b2ef..62b04568d 100644
--- a/gui/devices/720x1280/res/ui.xml
+++ b/gui/devices/720x1280/res/ui.xml
@@ -39,6 +39,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
+ <resource name="exclamation" type="image" filename="exclamation400" />
</resources>
<variables>
@@ -159,6 +160,8 @@
<variable name="row_dst_text_y" value="720" />
<variable name="row_offset_text_y" value="770" />
<variable name="row_offset_medium_y" value="840" />
+ <variable name="exclamation_x" value="160" />
+ <variable name="exclamation_y" value="400" />
</variables>
<templates>
@@ -798,6 +801,7 @@
<action function="set">tw_has_cancel=0</action>
<action function="set">tw_cancel_action=</action>
<action function="set">tw_cancel_param=</action>
+ <action function="set">tw_show_exclamation=0</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -805,6 +809,12 @@
<page name="confirm_action">
<object type="template" name="header" />
+ <object type="image">
+ <condition var1="tw_show_exclamation" var2="1" />
+ <image resource="exclamation" />
+ <placement x="%exclamation_x%" y="%exclamation_y%" />
+ </object>
+
<object type="text" color="%text_color%">
<font resource="font" />
<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -831,7 +841,7 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row10_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row15_text_y%" placement="5" />
<text>Press back button to cancel.</text>
</object>
@@ -1157,11 +1167,13 @@
<action function="set">tw_has_action2=1</action>
<action function="set">tw_action2=set</action>
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
- <action function="set">tw_text1=Format Data? (This wipes all media</action>
+ <action function="set">tw_text1=Format Data? (This wipes all internal storage</action>
<action function="set">tw_text2=including backups & removes encryption)</action>
+ <action function="set">tw_text3=Most of the time you do not need to do this.</action>
<action function="set">tw_action_text1=Formatting Data...</action>
<action function="set">tw_complete_text1=Data Format Complete</action>
<action function="set">tw_slider_text=Swipe to Format</action>
+ <action function="set">tw_show_exclamation=1</action>
<action function="page">confirm_action</action>
</actions>
</object>
diff --git a/gui/devices/800x1280/res/images/exclamation400.png b/gui/devices/800x1280/res/images/exclamation400.png
new file mode 100644
index 000000000..f3a8aabb6
--- /dev/null
+++ b/gui/devices/800x1280/res/images/exclamation400.png
Binary files differ
diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml
index b7c1e0429..54bc5dbed 100755
--- a/gui/devices/800x1280/res/ui.xml
+++ b/gui/devices/800x1280/res/ui.xml
@@ -39,6 +39,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
+ <resource name="exclamation" type="image" filename="exclamation400" />
</resources>
<variables>
@@ -155,6 +156,8 @@
<variable name="row_dst_text_y" value="720" />
<variable name="row_offset_text_y" value="800" />
<variable name="row_offset_medium_y" value="840" />
+ <variable name="exclamation_x" value="200" />
+ <variable name="exclamation_y" value="400" />
</variables>
<templates>
@@ -794,6 +797,7 @@
<action function="set">tw_has_cancel=0</action>
<action function="set">tw_cancel_action=</action>
<action function="set">tw_cancel_param=</action>
+ <action function="set">tw_show_exclamation=0</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -801,6 +805,14 @@
<page name="confirm_action">
<object type="template" name="header" />
+ <object type="button">
+ <condition var1="tw_show_exclamation" var2="1" />
+ <placement x="%exclamation_x%" y="%exclamation_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text></text>
+ <image resource="exclamation" />
+ </object>
+
<object type="text" color="%text_color%">
<font resource="font" />
<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -827,7 +839,7 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row10_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row15_text_y%" placement="5" />
<text>Press back button to cancel.</text>
</object>
@@ -1153,11 +1165,13 @@
<action function="set">tw_has_action2=1</action>
<action function="set">tw_action2=set</action>
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
- <action function="set">tw_text1=Format Data? (This wipes all media</action>
+ <action function="set">tw_text1=Format Data? (This wipes all internal storage</action>
<action function="set">tw_text2=including backups & removes encryption)</action>
+ <action function="set">tw_text3=Most of the time you do not need to do this.</action>
<action function="set">tw_action_text1=Formatting Data...</action>
<action function="set">tw_complete_text1=Data Format Complete</action>
<action function="set">tw_slider_text=Swipe to Format</action>
+ <action function="set">tw_show_exclamation=1</action>
<action function="page">confirm_action</action>
</actions>
</object>
diff --git a/gui/devices/800x480/res/images/exclamation150.png b/gui/devices/800x480/res/images/exclamation150.png
new file mode 100644
index 000000000..6e05987c1
--- /dev/null
+++ b/gui/devices/800x480/res/images/exclamation150.png
Binary files differ
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index 4454ffefb..7832ebbc8 100755
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/res/ui.xml
@@ -41,6 +41,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
+ <resource name="exclamation" type="image" filename="exclamation150" />
</resources>
<variables>
@@ -170,6 +171,8 @@
<variable name="terminal_text_y" value="247" />
<variable name="terminal_button_y" value="237" />
<variable name="terminal_input_width" value="551" />
+ <variable name="exclamation_x" value="325" />
+ <variable name="exclamation_y" value="120" />
</variables>
<templates>
@@ -822,6 +825,7 @@
<action function="set">tw_has_cancel=0</action>
<action function="set">tw_cancel_action=</action>
<action function="set">tw_cancel_param=</action>
+ <action function="set">tw_show_exclamation=0</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -829,6 +833,14 @@
<page name="confirm_action">
<object type="template" name="header" />
+ <object type="button">
+ <condition var1="tw_show_exclamation" var2="1" />
+ <placement x="%exclamation_x%" y="%exclamation_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text></text>
+ <image resource="exclamation" />
+ </object>
+
<object type="text" color="%text_color%">
<font resource="font" />
<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -855,7 +867,7 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row8_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row12_text_y%" placement="5" />
<text>Press back button to cancel.</text>
</object>
@@ -1575,9 +1587,11 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_text1=Format Data? (This wipes all media</action>
<action function="set">tw_text2=including backups & removes encryption)</action>
+ <action function="set">tw_text3=Most of the time you do not need to do this.</action>
<action function="set">tw_action_text1=Formatting Data...</action>
<action function="set">tw_complete_text1=Data Format Complete</action>
<action function="set">tw_slider_text=Swipe to Format</action>
+ <action function="set">tw_show_exclamation=1</action>
<action function="page">confirm_action</action>
</actions>
</object>
diff --git a/partition.cpp b/partition.cpp
index 633011ba6..3ef206a80 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -209,9 +209,10 @@ bool TWPartition::Process_Fstab_Line(string Line, bool Display_Error) {
Display_Name = "Cache";
Wipe_Available_in_GUI = true;
Wipe_During_Factory_Reset = true;
- if (!TWFunc::Path_Exists("/cache/recovery")) {
+ if (Mount(false) && !TWFunc::Path_Exists("/cache/recovery/.")) {
+ string Recreate_Command = "cd /cache && mkdir recovery";
LOGI("Recreating /cache/recovery folder.\n");
- TWFunc::Recursive_Mkdir("/cache/recovery");
+ system(Recreate_Command.c_str());
}
} else if (Mount_Point == "/datadata") {
Wipe_During_Factory_Reset = true;
@@ -1373,9 +1374,10 @@ void TWPartition::Recreate_AndSec_Folder(void) {
LOGE("Unable to recreate android secure folder.\n");
} else if (!TWFunc::Path_Exists(Symlink_Path)) {
LOGI("Recreating android secure folder.\n");
- TWFunc::Recursive_Mkdir(Symlink_Path);
Command = "umount " + Symlink_Mount_Point;
system(Command.c_str());
+ Command = "cd " + Mount_Point + " && mkdir .android_secure";
+ system(Command.c_str());
Command = "mount " + Symlink_Path + " " + Symlink_Mount_Point;
system(Command.c_str());
}
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 048077a22..8b7c2f17a 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -71,6 +71,15 @@ LOCAL_GENERATED_SOURCES := $(GEN)
LOCAL_SRC_FILES := teamwin $(GEN)
include $(BUILD_PREBUILT)
+#bbinstall.sh
+include $(CLEAR_VARS)
+LOCAL_MODULE := bbinstall.sh
+LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
#fix_permissions
include $(CLEAR_VARS)
LOCAL_MODULE := fix_permissions.sh
diff --git a/prebuilt/bbinstall.sh b/prebuilt/bbinstall.sh
new file mode 100755
index 000000000..2aab96958
--- /dev/null
+++ b/prebuilt/bbinstall.sh
@@ -0,0 +1,14 @@
+#!/sbin/sh
+
+if [ -f "/sbin/[" ];
+then
+exit
+fi
+
+for cmd in $(/sbin/busybox --list); do
+ /sbin/busybox ln -s /sbin/busybox /sbin/$cmd
+done
+
+ln -sf /sbin/pigz /sbin/gzip
+ln -sf /sbin/unpigz /sbin/gunzip
+rm /sbin/mkdosfs \ No newline at end of file
diff --git a/recovery.cpp b/recovery.cpp
index 41bd080ce..f6bfd4537 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -809,6 +809,8 @@ main(int argc, char **argv) {
DataManager_LoadDefaults();
printf("Starting the UI...");
gui_init();
+ printf("=> Installing busybox into /sbin\n");
+ system("/sbin/bbinstall.sh"); // Let's install busybox
printf("=> Linking mtab\n");
system("ln -s /proc/mounts /etc/mtab"); // And link mtab for mke2fs
printf("=> Processing recovery.fstab\n");
diff --git a/variables.h b/variables.h
index d3ca67eb6..860b35717 100644
--- a/variables.h
+++ b/variables.h
@@ -17,7 +17,7 @@
#ifndef _VARIABLES_HEADER_
#define _VARIABLES_HEADER_
-#define TW_VERSION_STR "2.3.0.0RC0"
+#define TW_VERSION_STR "2.3.0.0RC1"
#define TW_USE_COMPRESSION_VAR "tw_use_compression"
#define TW_IGNORE_IMAGE_SIZE "tw_ignore_image_size"