summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2016-01-27 17:57:26 +0100
committerEthan Yonker <dees_troy@teamw.in>2016-01-27 17:58:02 +0100
commite95c4868b9ba215e858294fb4d0bfbf2634d01f4 (patch)
tree8f8bb99a064cfc7f8cb58dfa610620c9b44b5bf3
parentUpdate minuitwrp graphics in line with latest minui (diff)
downloadandroid_bootable_recovery-e95c4868b9ba215e858294fb4d0bfbf2634d01f4.tar
android_bootable_recovery-e95c4868b9ba215e858294fb4d0bfbf2634d01f4.tar.gz
android_bootable_recovery-e95c4868b9ba215e858294fb4d0bfbf2634d01f4.tar.bz2
android_bootable_recovery-e95c4868b9ba215e858294fb4d0bfbf2634d01f4.tar.lz
android_bootable_recovery-e95c4868b9ba215e858294fb4d0bfbf2634d01f4.tar.xz
android_bootable_recovery-e95c4868b9ba215e858294fb4d0bfbf2634d01f4.tar.zst
android_bootable_recovery-e95c4868b9ba215e858294fb4d0bfbf2634d01f4.zip
Diffstat
-rwxr-xr-xgui/theme/landscape_hdpi/splash.xml3
-rw-r--r--gui/theme/landscape_hdpi/ui.xml2
-rwxr-xr-xgui/theme/landscape_mdpi/splash.xml3
-rw-r--r--gui/theme/landscape_mdpi/ui.xml2
-rwxr-xr-xgui/theme/portrait_hdpi/splash.xml3
-rw-r--r--gui/theme/portrait_hdpi/ui.xml2
-rwxr-xr-xgui/theme/portrait_mdpi/splash.xml3
-rw-r--r--gui/theme/portrait_mdpi/ui.xml2
-rwxr-xr-xgui/theme/watch_mdpi/splash.xml3
-rw-r--r--gui/theme/watch_mdpi/ui.xml2
-rw-r--r--minuitwrp/Android.mk6
-rw-r--r--minuitwrp/resources.cpp8
-rw-r--r--prebuilt/Android.mk2
13 files changed, 23 insertions, 18 deletions
diff --git a/gui/theme/landscape_hdpi/splash.xml b/gui/theme/landscape_hdpi/splash.xml
index 1a9fd5340..cbadcde72 100755
--- a/gui/theme/landscape_hdpi/splash.xml
+++ b/gui/theme/landscape_hdpi/splash.xml
@@ -4,8 +4,7 @@
<resolution width="1920" height="1200"/>
<author>TeamWin</author>
<title>TWRP</title>
- <description>Default basic theme</description>
- <preview>preview.jpg</preview>
+ <description>splash screen</description>
<themeversion>1</themeversion>
</details>
diff --git a/gui/theme/landscape_hdpi/ui.xml b/gui/theme/landscape_hdpi/ui.xml
index 1246b7546..2e263520a 100644
--- a/gui/theme/landscape_hdpi/ui.xml
+++ b/gui/theme/landscape_hdpi/ui.xml
@@ -5,7 +5,7 @@
<author>TeamWin</author>
<title>Backup Naowz</title>
<description>Default basic theme</description>
- <preview>preview.jpg</preview>
+ <preview>preview.png</preview>
<themeversion>1</themeversion>
</details>
diff --git a/gui/theme/landscape_mdpi/splash.xml b/gui/theme/landscape_mdpi/splash.xml
index 34f832578..d4f16fcd3 100755
--- a/gui/theme/landscape_mdpi/splash.xml
+++ b/gui/theme/landscape_mdpi/splash.xml
@@ -4,8 +4,7 @@
<resolution width="800" height="480"/>
<author>TeamWin</author>
<title>TWRP</title>
- <description>Default basic theme</description>
- <preview>preview.jpg</preview>
+ <description>splash screen</description>
<themeversion>1</themeversion>
</details>
diff --git a/gui/theme/landscape_mdpi/ui.xml b/gui/theme/landscape_mdpi/ui.xml
index 3c4c7836c..8b63dcbfd 100644
--- a/gui/theme/landscape_mdpi/ui.xml
+++ b/gui/theme/landscape_mdpi/ui.xml
@@ -5,7 +5,7 @@
<author>TeamWin</author>
<title>Backup Naowz</title>
<description>Default basic theme</description>
- <preview>preview.jpg</preview>
+ <preview>preview.png</preview>
<themeversion>1</themeversion>
</details>
diff --git a/gui/theme/portrait_hdpi/splash.xml b/gui/theme/portrait_hdpi/splash.xml
index 964b2af98..02717e274 100755
--- a/gui/theme/portrait_hdpi/splash.xml
+++ b/gui/theme/portrait_hdpi/splash.xml
@@ -4,8 +4,7 @@
<resolution width="1080" height="1920"/>
<author>TeamWin</author>
<title>TWRP</title>
- <description>Default basic theme</description>
- <preview>preview.jpg</preview>
+ <description>splash screen</description>
<themeversion>1</themeversion>
</details>
diff --git a/gui/theme/portrait_hdpi/ui.xml b/gui/theme/portrait_hdpi/ui.xml
index 18385ad23..5fc8cd202 100644
--- a/gui/theme/portrait_hdpi/ui.xml
+++ b/gui/theme/portrait_hdpi/ui.xml
@@ -5,7 +5,7 @@
<author>TeamWin</author>
<title>Backup Naowz</title>
<description>Default basic theme</description>
- <preview>preview.jpg</preview>
+ <preview>preview.png</preview>
<themeversion>1</themeversion>
</details>
diff --git a/gui/theme/portrait_mdpi/splash.xml b/gui/theme/portrait_mdpi/splash.xml
index 31f793380..dad53cce9 100755
--- a/gui/theme/portrait_mdpi/splash.xml
+++ b/gui/theme/portrait_mdpi/splash.xml
@@ -4,8 +4,7 @@
<resolution width="480" height="800"/>
<author>TeamWin</author>
<title>TWRP</title>
- <description>Default basic theme</description>
- <preview>preview.jpg</preview>
+ <description>splash screen</description>
<themeversion>1</themeversion>
</details>
diff --git a/gui/theme/portrait_mdpi/ui.xml b/gui/theme/portrait_mdpi/ui.xml
index 4d002ff57..5ac6b9554 100644
--- a/gui/theme/portrait_mdpi/ui.xml
+++ b/gui/theme/portrait_mdpi/ui.xml
@@ -5,7 +5,7 @@
<author>TeamWin</author>
<title>Backup Naowz</title>
<description>Default basic theme</description>
- <preview>preview.jpg</preview>
+ <preview>preview.png</preview>
<themeversion>1</themeversion>
</details>
diff --git a/gui/theme/watch_mdpi/splash.xml b/gui/theme/watch_mdpi/splash.xml
index 81bef4513..ff9bc9859 100755
--- a/gui/theme/watch_mdpi/splash.xml
+++ b/gui/theme/watch_mdpi/splash.xml
@@ -4,8 +4,7 @@
<resolution width="320" height="320"/>
<author>TeamWin</author>
<title>TWRP</title>
- <description>Default basic theme</description>
- <preview>preview.jpg</preview>
+ <description>splash screen</description>
<themeversion>1</themeversion>
</details>
diff --git a/gui/theme/watch_mdpi/ui.xml b/gui/theme/watch_mdpi/ui.xml
index bad23c02e..c56610bf2 100644
--- a/gui/theme/watch_mdpi/ui.xml
+++ b/gui/theme/watch_mdpi/ui.xml
@@ -6,7 +6,7 @@
<author>TeamWin</author>
<title>Backup Naowz</title>
<description>Default basic theme</description>
- <preview>preview.jpg</preview>
+ <preview>preview.png</preview>
<themeversion>1</themeversion>
</details>
diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk
index 39c61c40e..ac4c181e5 100644
--- a/minuitwrp/Android.mk
+++ b/minuitwrp/Android.mk
@@ -55,10 +55,11 @@ LOCAL_C_INCLUDES += \
external/libpng \
external/zlib \
system/core/include \
- external/jpeg \
external/freetype/include \
external/libcxx/include
+#external/jpeg \
+
ifeq ($(RECOVERY_TOUCHSCREEN_SWAP_XY), true)
LOCAL_CFLAGS += -DRECOVERY_TOUCHSCREEN_SWAP_XY
endif
@@ -151,7 +152,8 @@ endif
LOCAL_CLANG := true
LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\"
-LOCAL_SHARED_LIBRARIES += libft2 libz libc libcutils libjpeg libpng libutils
+LOCAL_SHARED_LIBRARIES += libft2 libz libc libcutils libpng libutils
+#libjpeg
LOCAL_STATIC_LIBRARIES += libpixelflinger_twrp
LOCAL_MODULE_TAGS := eng
LOCAL_MODULE := libminuitwrp
diff --git a/minuitwrp/resources.cpp b/minuitwrp/resources.cpp
index 781df2b06..c4325e412 100644
--- a/minuitwrp/resources.cpp
+++ b/minuitwrp/resources.cpp
@@ -31,9 +31,11 @@
#include <png.h>
#include <pixelflinger/pixelflinger.h>
+#ifdef TW_INCLUDE_JPEG
extern "C" {
#include "jpeglib.h"
}
+#endif
#include "minui.h"
#define SURFACE_DATA_ALIGNMENT 8
@@ -251,6 +253,7 @@ int res_create_surface_png(const char* name, gr_surface* pSurface) {
return result;
}
+#ifdef TW_INCLUDE_JPEG
int res_create_surface_jpg(const char* name, gr_surface* pSurface) {
GGLSurface* surface = NULL;
int result = 0, y;
@@ -348,18 +351,23 @@ exit:
}
return result;
}
+#endif
int res_create_surface(const char* name, gr_surface* pSurface) {
int ret;
if (!name) return -1;
+#ifdef TW_INCLUDE_JPEG
if (strlen(name) > 4 && strcmp(name + strlen(name) - 4, ".jpg") == 0)
return res_create_surface_jpg(name,pSurface);
+#endif
ret = res_create_surface_png(name,pSurface);
+#ifdef TW_INCLUDE_JPEG
if (ret < 0)
ret = res_create_surface_jpg(name,pSurface);
+#endif
return ret;
}
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 825b990ea..e22883c8c 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -122,7 +122,7 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext4_utils.so
endif
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libaosprecovery.so
-RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libjpeg.so
+#RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libjpeg.so
ifeq ($(TWHAVE_SELINUX), true)
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libselinux.so
ifneq ($(TARGET_USERIMAGES_USE_EXT4), true)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 22:36:58 +0200