diff --git a/gui/Android.mk b/gui/Android.mk
index 0b5afe1d..81cd5597 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -29,9 +29,9 @@ LOCAL_SRC_FILES := \
scrolllist.cpp
ifneq ($(TWRP_CUSTOM_KEYBOARD),)
- LOCAL_SRC_FILES += $(TWRP_CUSTOM_KEYBOARD)
+ LOCAL_SRC_FILES += $(TWRP_CUSTOM_KEYBOARD)
else
- LOCAL_SRC_FILES += hardwarekeyboard.cpp
+ LOCAL_SRC_FILES += hardwarekeyboard.cpp
endif
LOCAL_SHARED_LIBRARIES += libminuitwrp libc libstdc++ libminzip libaosprecovery
@@ -43,10 +43,10 @@ LOCAL_CFLAGS += -D_EVENT_LOGGING
endif
ifneq ($(TW_NO_SCREEN_BLANK),)
- LOCAL_CFLAGS += -DTW_NO_SCREEN_BLANK
+ LOCAL_CFLAGS += -DTW_NO_SCREEN_BLANK
endif
ifneq ($(TW_NO_SCREEN_TIMEOUT),)
- LOCAL_CFLAGS += -DTW_NO_SCREEN_TIMEOUT
+ LOCAL_CFLAGS += -DTW_NO_SCREEN_TIMEOUT
endif
ifeq ($(HAVE_SELINUX), true)
LOCAL_CFLAGS += -DHAVE_SELINUX
@@ -58,31 +58,13 @@ ifeq ($(TW_DISABLE_TTF), true)
LOCAL_CFLAGS += -DTW_DISABLE_TTF
endif
ifneq ($(TW_X_OFFSET),)
- LOCAL_CFLAGS += -DTW_X_OFFSET=$(TW_X_OFFSET)
+ LOCAL_CFLAGS += -DTW_X_OFFSET=$(TW_X_OFFSET)
endif
ifneq ($(TW_Y_OFFSET),)
- LOCAL_CFLAGS += -DTW_Y_OFFSET=$(TW_Y_OFFSET)
+ LOCAL_CFLAGS += -DTW_Y_OFFSET=$(TW_Y_OFFSET)
endif
ifeq ($(TW_ROUND_SCREEN), true)
- LOCAL_CFLAGS += -DTW_ROUND_SCREEN
-endif
-
-ifeq ($(DEVICE_RESOLUTION),)
- $(warning ********************************************************************************)
- $(warning * DEVICE_RESOLUTION is NOT SET in BoardConfig.mk )
- $(warning * Please see http://tinyw.in/50tg for details. )
- $(warning ********************************************************************************)
- $(error stopping)
-endif
-
-ifeq ($(TW_CUSTOM_THEME),)
- ifeq "$(wildcard $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION))" ""
- $(warning ********************************************************************************)
- $(warning * DEVICE_RESOLUTION ($(DEVICE_RESOLUTION)) does NOT EXIST in $(commands_recovery_local_path)/gui/devices )
- $(warning * Please choose an existing theme or create a new one for your device. )
- $(warning ********************************************************************************)
- $(error stopping)
- endif
+ LOCAL_CFLAGS += -DTW_ROUND_SCREEN
endif
LOCAL_C_INCLUDES += bionic external/stlport/stlport $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION)
@@ -100,32 +82,64 @@ TWRP_RES_LOC := $(commands_recovery_local_path)/gui/devices/common/res
TWRP_COMMON_XML := $(hide) echo "No common TWRP XML resources"
ifeq ($(TW_CUSTOM_THEME),)
- PORTRAIT := 320x480 480x800 480x854 540x960 720x1280 800x1280 1080x1920 1200x1920 1440x2560 1600x2560
- LANDSCAPE := 800x480 1024x600 1024x768 1280x800 1920x1200 2560x1600
- WATCH := 240x240 280x280 320x320
- TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION)/res
- ifneq ($(filter $(DEVICE_RESOLUTION), $(PORTRAIT)),)
- TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/portrait/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
- else ifneq ($(filter $(DEVICE_RESOLUTION), $(LANDSCAPE)),)
- TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/landscape/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
- else ifneq ($(filter $(DEVICE_RESOLUTION), $(WATCH)),)
- TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/watch/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
- endif
+ ifeq ($(TW_THEME),)
+ # This converts the old DEVICE_RESOLUTION flag to the new TW_THEME flag
+ PORTRAIT_MDPI := 320x480 480x800 480x854 540x960
+ PORTRAIT_HDPI := 720x1280 800x1280 1080x1920 1200x1920 1440x2560 1600x2560
+ WATCH_MDPI := 240x240 280x280 320x320
+ LANDSCAPE_MDPI := 800x480 1024x600 1024x768
+ LANDSCAPE_HDPI := 1280x800 1920x1200 2560x1600
+ ifneq ($(filter $(DEVICE_RESOLUTION), $(PORTRAIT_MDPI)),)
+ TW_THEME := portrait_mdpi
+ else ifneq ($(filter $(DEVICE_RESOLUTION), $(PORTRAIT_HDPI)),)
+ TW_THEME := portrait_hdpi
+ else ifneq ($(filter $(DEVICE_RESOLUTION), $(WATCH_MDPI)),)
+ TW_THEME := watch_mdpi
+ else ifneq ($(filter $(DEVICE_RESOLUTION), $(LANDSCAPE_MDPI)),)
+ TW_THEME := landscape_mdpi
+ else ifneq ($(filter $(DEVICE_RESOLUTION), $(LANDSCAPE_HDPI)),)
+ TW_THEME := landscape_hdpi
+ endif
+ endif
+ ifeq ($(TW_THEME), portrait_mdpi)
+ TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/480x800/res
+ TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/portrait/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
+ else ifeq ($(TW_THEME), portrait_hdpi)
+ TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/1080x1920/res
+ TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/portrait/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
+ else ifeq ($(TW_THEME), watch_mdpi)
+ TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/320x320/res
+ TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/watch/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
+ else ifeq ($(TW_THEME), landscape_mdpi)
+ TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/800x480/res
+ TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/landscape/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
+ else ifeq ($(TW_THEME), landscape_hdpi)
+ TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/1920x1200/res
+ TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/landscape/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
+ else
+ $(warning ****************************************************************************)
+ $(warning * TW_THEME ($(TW_THEME)) is not valid.)
+ $(warning * Please choose an appropriate TW_THEME or create a new one for your device.)
+ $(warning * Valid options are portrait_mdpi portrait_hdpi watch_mdpi)
+ $(warning * landscape_mdpi landscape_hdpi)
+ $(warning ****************************************************************************)
+ $(error stopping)
+ endif
else
- TWRP_THEME_LOC := $(TW_CUSTOM_THEME)
+ TWRP_THEME_LOC := $(TW_CUSTOM_THEME)
endif
ifeq ($(TW_DISABLE_TTF), true)
- TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)fonts/*.ttf
+ TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)fonts/*.ttf
else
- TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)fonts/*.dat
+ TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)fonts/*.dat
endif
TWRP_RES_GEN := $(intermediates)/twrp
ifneq ($(TW_USE_TOOLBOX), true)
- TWRP_SH_TARGET := /sbin/busybox
+ TWRP_SH_TARGET := /sbin/busybox
else
- TWRP_SH_TARGET := /sbin/mksh
+ TWRP_SH_TARGET := /sbin/mksh
endif
$(TWRP_RES_GEN):
diff --git a/gui/console.cpp b/gui/console.cpp
index b1b025c4..1544d77a 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -130,7 +130,7 @@ GUIConsole::GUIConsole(xml_node<>* node) : GUIScrollList(node)
{
mSlideout = 1;
mSlideoutState = hidden;
- LoadPlacement(child, &mSlideoutX, &mSlideoutY);
+ LoadPlacement(child, &mSlideoutX, &mSlideoutY, &mSlideoutW, &mSlideoutH, &mPlacement);
mSlideoutImage = LoadAttrImage(child, "resource");
@@ -138,6 +138,12 @@ GUIConsole::GUIConsole(xml_node<>* node) : GUIScrollList(node)
{
mSlideoutW = mSlideoutImage->GetWidth();
mSlideoutH = mSlideoutImage->GetHeight();
+ if (mPlacement == CENTER || mPlacement == CENTER_X_ONLY) {
+ mSlideoutX = mSlideoutX - (mSlideoutW / 2);
+ if (mPlacement == CENTER) {
+ mSlideoutY = mSlideoutY - (mSlideoutH / 2);
+ }
+ }
}
}
}
diff --git a/gui/devices/1024x600/res/fonts/Roboto-Regular-20.dat b/gui/devices/1024x600/res/fonts/Roboto-Regular-20.dat
deleted file mode 100755
index 6588b41e..00000000
Binary files a/gui/devices/1024x600/res/fonts/Roboto-Regular-20.dat and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/back-icon.png b/gui/devices/1024x600/res/images/back-icon.png
deleted file mode 100644
index 1096c909..00000000
Binary files a/gui/devices/1024x600/res/images/back-icon.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/background.jpg b/gui/devices/1024x600/res/images/background.jpg
deleted file mode 100644
index 2ac48e0a..00000000
Binary files a/gui/devices/1024x600/res/images/background.jpg and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/button.png b/gui/devices/1024x600/res/images/button.png
deleted file mode 100644
index 6ae29aeb..00000000
Binary files a/gui/devices/1024x600/res/images/button.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/checkbox_checked.png b/gui/devices/1024x600/res/images/checkbox_checked.png
deleted file mode 100644
index 3447349c..00000000
Binary files a/gui/devices/1024x600/res/images/checkbox_checked.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/checkbox_empty.png b/gui/devices/1024x600/res/images/checkbox_empty.png
deleted file mode 100644
index f5f35d8d..00000000
Binary files a/gui/devices/1024x600/res/images/checkbox_empty.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/console-icon.png b/gui/devices/1024x600/res/images/console-icon.png
deleted file mode 100644
index 91a727d4..00000000
Binary files a/gui/devices/1024x600/res/images/console-icon.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/console-toggle.png b/gui/devices/1024x600/res/images/console-toggle.png
deleted file mode 100644
index 963b9fdb..00000000
Binary files a/gui/devices/1024x600/res/images/console-toggle.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/cursor.png b/gui/devices/1024x600/res/images/cursor.png
deleted file mode 100644
index 32c8ae1c..00000000
Binary files a/gui/devices/1024x600/res/images/cursor.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/curtain.jpg b/gui/devices/1024x600/res/images/curtain.jpg
deleted file mode 100644
index bb66e994..00000000
Binary files a/gui/devices/1024x600/res/images/curtain.jpg and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/file.png b/gui/devices/1024x600/res/images/file.png
deleted file mode 100644
index 8556bc7f..00000000
Binary files a/gui/devices/1024x600/res/images/file.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/folder.png b/gui/devices/1024x600/res/images/folder.png
deleted file mode 100644
index a3a5f69d..00000000
Binary files a/gui/devices/1024x600/res/images/folder.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/home-icon.png b/gui/devices/1024x600/res/images/home-icon.png
deleted file mode 100644
index e42d774b..00000000
Binary files a/gui/devices/1024x600/res/images/home-icon.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/indeterminate001.png b/gui/devices/1024x600/res/images/indeterminate001.png
deleted file mode 100755
index e6fa1c57..00000000
Binary files a/gui/devices/1024x600/res/images/indeterminate001.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/indeterminate002.png b/gui/devices/1024x600/res/images/indeterminate002.png
deleted file mode 100755
index e1fceaba..00000000
Binary files a/gui/devices/1024x600/res/images/indeterminate002.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/indeterminate003.png b/gui/devices/1024x600/res/images/indeterminate003.png
deleted file mode 100755
index 67028674..00000000
Binary files a/gui/devices/1024x600/res/images/indeterminate003.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/indeterminate004.png b/gui/devices/1024x600/res/images/indeterminate004.png
deleted file mode 100755
index ff65e093..00000000
Binary files a/gui/devices/1024x600/res/images/indeterminate004.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/indeterminate005.png b/gui/devices/1024x600/res/images/indeterminate005.png
deleted file mode 100755
index e61e2cc1..00000000
Binary files a/gui/devices/1024x600/res/images/indeterminate005.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/indeterminate006.png b/gui/devices/1024x600/res/images/indeterminate006.png
deleted file mode 100755
index c9c21ba9..00000000
Binary files a/gui/devices/1024x600/res/images/indeterminate006.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/keyboard1.png b/gui/devices/1024x600/res/images/keyboard1.png
deleted file mode 100644
index c2aa0a08..00000000
Binary files a/gui/devices/1024x600/res/images/keyboard1.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/keyboard2.png b/gui/devices/1024x600/res/images/keyboard2.png
deleted file mode 100644
index 88511453..00000000
Binary files a/gui/devices/1024x600/res/images/keyboard2.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/keyboard3.png b/gui/devices/1024x600/res/images/keyboard3.png
deleted file mode 100644
index 5c99fada..00000000
Binary files a/gui/devices/1024x600/res/images/keyboard3.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/keyboard4.png b/gui/devices/1024x600/res/images/keyboard4.png
deleted file mode 100644
index 30bae148..00000000
Binary files a/gui/devices/1024x600/res/images/keyboard4.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/medium-button.png b/gui/devices/1024x600/res/images/medium-button.png
deleted file mode 100644
index 77dc5407..00000000
Binary files a/gui/devices/1024x600/res/images/medium-button.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/mediumwide-button.png b/gui/devices/1024x600/res/images/mediumwide-button.png
deleted file mode 100644
index b2b7d4de..00000000
Binary files a/gui/devices/1024x600/res/images/mediumwide-button.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/minus-button.png b/gui/devices/1024x600/res/images/minus-button.png
deleted file mode 100644
index 5a49c758..00000000
Binary files a/gui/devices/1024x600/res/images/minus-button.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/plus-button.png b/gui/devices/1024x600/res/images/plus-button.png
deleted file mode 100644
index da1326c9..00000000
Binary files a/gui/devices/1024x600/res/images/plus-button.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/progress_empty.png b/gui/devices/1024x600/res/images/progress_empty.png
deleted file mode 100644
index b8537101..00000000
Binary files a/gui/devices/1024x600/res/images/progress_empty.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/progress_fill.png b/gui/devices/1024x600/res/images/progress_fill.png
deleted file mode 100644
index 669c6efa..00000000
Binary files a/gui/devices/1024x600/res/images/progress_fill.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/radio_empty.png b/gui/devices/1024x600/res/images/radio_empty.png
deleted file mode 100644
index 88d1c1f5..00000000
Binary files a/gui/devices/1024x600/res/images/radio_empty.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/radio_selected.png b/gui/devices/1024x600/res/images/radio_selected.png
deleted file mode 100644
index 864065de..00000000
Binary files a/gui/devices/1024x600/res/images/radio_selected.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/slider-touch.png b/gui/devices/1024x600/res/images/slider-touch.png
deleted file mode 100644
index d8647b8a..00000000
Binary files a/gui/devices/1024x600/res/images/slider-touch.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/slider-used.png b/gui/devices/1024x600/res/images/slider-used.png
deleted file mode 100644
index bf6cad92..00000000
Binary files a/gui/devices/1024x600/res/images/slider-used.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/slider.png b/gui/devices/1024x600/res/images/slider.png
deleted file mode 100644
index 4081ea54..00000000
Binary files a/gui/devices/1024x600/res/images/slider.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/sort-button.png b/gui/devices/1024x600/res/images/sort-button.png
deleted file mode 100644
index 13ab929d..00000000
Binary files a/gui/devices/1024x600/res/images/sort-button.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/unlock.png b/gui/devices/1024x600/res/images/unlock.png
deleted file mode 100644
index 90412212..00000000
Binary files a/gui/devices/1024x600/res/images/unlock.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml
deleted file mode 100644
index 0d097502..00000000
--- a/gui/devices/1024x600/res/ui.xml
+++ /dev/null
@@ -1,441 +0,0 @@
-
-
-
-
-
- TeamWin
- Backup Naowz
- Default basic theme
- preview.jpg
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/devices/1024x768/res/fonts/Roboto-Regular-20.dat b/gui/devices/1024x768/res/fonts/Roboto-Regular-20.dat
deleted file mode 100755
index 6588b41e..00000000
Binary files a/gui/devices/1024x768/res/fonts/Roboto-Regular-20.dat and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/back-icon.png b/gui/devices/1024x768/res/images/back-icon.png
deleted file mode 100644
index 1096c909..00000000
Binary files a/gui/devices/1024x768/res/images/back-icon.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/background.jpg b/gui/devices/1024x768/res/images/background.jpg
deleted file mode 100644
index 2ac48e0a..00000000
Binary files a/gui/devices/1024x768/res/images/background.jpg and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/button.png b/gui/devices/1024x768/res/images/button.png
deleted file mode 100644
index 6ae29aeb..00000000
Binary files a/gui/devices/1024x768/res/images/button.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/checkbox_checked.png b/gui/devices/1024x768/res/images/checkbox_checked.png
deleted file mode 100644
index 3447349c..00000000
Binary files a/gui/devices/1024x768/res/images/checkbox_checked.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/checkbox_empty.png b/gui/devices/1024x768/res/images/checkbox_empty.png
deleted file mode 100644
index f5f35d8d..00000000
Binary files a/gui/devices/1024x768/res/images/checkbox_empty.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/console-icon.png b/gui/devices/1024x768/res/images/console-icon.png
deleted file mode 100644
index 91a727d4..00000000
Binary files a/gui/devices/1024x768/res/images/console-icon.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/console-toggle.png b/gui/devices/1024x768/res/images/console-toggle.png
deleted file mode 100644
index 963b9fdb..00000000
Binary files a/gui/devices/1024x768/res/images/console-toggle.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/cursor.png b/gui/devices/1024x768/res/images/cursor.png
deleted file mode 100644
index 32c8ae1c..00000000
Binary files a/gui/devices/1024x768/res/images/cursor.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/curtain.jpg b/gui/devices/1024x768/res/images/curtain.jpg
deleted file mode 100644
index 38cc331b..00000000
Binary files a/gui/devices/1024x768/res/images/curtain.jpg and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/file.png b/gui/devices/1024x768/res/images/file.png
deleted file mode 100644
index 8556bc7f..00000000
Binary files a/gui/devices/1024x768/res/images/file.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/folder.png b/gui/devices/1024x768/res/images/folder.png
deleted file mode 100644
index a3a5f69d..00000000
Binary files a/gui/devices/1024x768/res/images/folder.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/home-icon.png b/gui/devices/1024x768/res/images/home-icon.png
deleted file mode 100644
index e42d774b..00000000
Binary files a/gui/devices/1024x768/res/images/home-icon.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/indeterminate001.png b/gui/devices/1024x768/res/images/indeterminate001.png
deleted file mode 100755
index e6fa1c57..00000000
Binary files a/gui/devices/1024x768/res/images/indeterminate001.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/indeterminate002.png b/gui/devices/1024x768/res/images/indeterminate002.png
deleted file mode 100755
index e1fceaba..00000000
Binary files a/gui/devices/1024x768/res/images/indeterminate002.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/indeterminate003.png b/gui/devices/1024x768/res/images/indeterminate003.png
deleted file mode 100755
index 67028674..00000000
Binary files a/gui/devices/1024x768/res/images/indeterminate003.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/indeterminate004.png b/gui/devices/1024x768/res/images/indeterminate004.png
deleted file mode 100755
index ff65e093..00000000
Binary files a/gui/devices/1024x768/res/images/indeterminate004.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/indeterminate005.png b/gui/devices/1024x768/res/images/indeterminate005.png
deleted file mode 100755
index e61e2cc1..00000000
Binary files a/gui/devices/1024x768/res/images/indeterminate005.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/indeterminate006.png b/gui/devices/1024x768/res/images/indeterminate006.png
deleted file mode 100755
index c9c21ba9..00000000
Binary files a/gui/devices/1024x768/res/images/indeterminate006.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/keyboard1.png b/gui/devices/1024x768/res/images/keyboard1.png
deleted file mode 100644
index 1c262e68..00000000
Binary files a/gui/devices/1024x768/res/images/keyboard1.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/keyboard2.png b/gui/devices/1024x768/res/images/keyboard2.png
deleted file mode 100644
index 140503b5..00000000
Binary files a/gui/devices/1024x768/res/images/keyboard2.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/keyboard3.png b/gui/devices/1024x768/res/images/keyboard3.png
deleted file mode 100644
index bb8f58d4..00000000
Binary files a/gui/devices/1024x768/res/images/keyboard3.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/keyboard4.png b/gui/devices/1024x768/res/images/keyboard4.png
deleted file mode 100644
index f3b44456..00000000
Binary files a/gui/devices/1024x768/res/images/keyboard4.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/medium-button.png b/gui/devices/1024x768/res/images/medium-button.png
deleted file mode 100644
index 77dc5407..00000000
Binary files a/gui/devices/1024x768/res/images/medium-button.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/mediumwide-button.png b/gui/devices/1024x768/res/images/mediumwide-button.png
deleted file mode 100644
index b2b7d4de..00000000
Binary files a/gui/devices/1024x768/res/images/mediumwide-button.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/minus-button.png b/gui/devices/1024x768/res/images/minus-button.png
deleted file mode 100644
index 5a49c758..00000000
Binary files a/gui/devices/1024x768/res/images/minus-button.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/plus-button.png b/gui/devices/1024x768/res/images/plus-button.png
deleted file mode 100644
index da1326c9..00000000
Binary files a/gui/devices/1024x768/res/images/plus-button.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/progress_empty.png b/gui/devices/1024x768/res/images/progress_empty.png
deleted file mode 100644
index b8537101..00000000
Binary files a/gui/devices/1024x768/res/images/progress_empty.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/progress_fill.png b/gui/devices/1024x768/res/images/progress_fill.png
deleted file mode 100644
index 669c6efa..00000000
Binary files a/gui/devices/1024x768/res/images/progress_fill.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/radio_empty.png b/gui/devices/1024x768/res/images/radio_empty.png
deleted file mode 100644
index 88d1c1f5..00000000
Binary files a/gui/devices/1024x768/res/images/radio_empty.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/radio_selected.png b/gui/devices/1024x768/res/images/radio_selected.png
deleted file mode 100644
index 864065de..00000000
Binary files a/gui/devices/1024x768/res/images/radio_selected.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/slider-touch.png b/gui/devices/1024x768/res/images/slider-touch.png
deleted file mode 100644
index d8647b8a..00000000
Binary files a/gui/devices/1024x768/res/images/slider-touch.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/slider-used.png b/gui/devices/1024x768/res/images/slider-used.png
deleted file mode 100644
index bf6cad92..00000000
Binary files a/gui/devices/1024x768/res/images/slider-used.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/slider.png b/gui/devices/1024x768/res/images/slider.png
deleted file mode 100644
index 4081ea54..00000000
Binary files a/gui/devices/1024x768/res/images/slider.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/sort-button.png b/gui/devices/1024x768/res/images/sort-button.png
deleted file mode 100644
index 13ab929d..00000000
Binary files a/gui/devices/1024x768/res/images/sort-button.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/unlock.png b/gui/devices/1024x768/res/images/unlock.png
deleted file mode 100644
index 90412212..00000000
Binary files a/gui/devices/1024x768/res/images/unlock.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
deleted file mode 100644
index fbc984ac..00000000
--- a/gui/devices/1024x768/res/ui.xml
+++ /dev/null
@@ -1,441 +0,0 @@
-
-
-
-
-
- TeamWin
- Backup Naowz
- Default basic theme
- preview.jpg
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/devices/1080x1920/res/images/top-bar.jpg b/gui/devices/1080x1920/res/images/top-bar.jpg
deleted file mode 100644
index 5121a031..00000000
Binary files a/gui/devices/1080x1920/res/images/top-bar.jpg and /dev/null differ
diff --git a/gui/devices/1080x1920/res/images/twrplogo.png b/gui/devices/1080x1920/res/images/twrplogo.png
new file mode 100644
index 00000000..16b1b2a1
Binary files /dev/null and b/gui/devices/1080x1920/res/images/twrplogo.png differ
diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml
index 84f2c5e8..e480fec8 100644
--- a/gui/devices/1080x1920/res/ui.xml
+++ b/gui/devices/1080x1920/res/ui.xml
@@ -17,11 +17,11 @@
-
+
-
-
-
+
+
+
@@ -33,12 +33,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -98,7 +98,6 @@
-
@@ -109,7 +108,7 @@
-
+
@@ -167,8 +166,7 @@
-
-
+
@@ -212,9 +210,17 @@
+
+
+
+