diff options
| -rw-r--r-- | gui/Android.mk | 91 |
1 files changed, 59 insertions, 32 deletions
diff --git a/gui/Android.mk b/gui/Android.mk index a1cd043a2..17defd953 100644 --- a/gui/Android.mk +++ b/gui/Android.mk @@ -90,6 +90,27 @@ LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH) +# The extra blank line before *** is intentional to ensure it ends up on its own line +define TW_THEME_WARNING_MSG + +**************************************************************************** + Could not find ui.xml for TW_THEME: $(TW_THEME) + Set TARGET_SCREEN_WIDTH and TARGET_SCREEN_HEIGHT to automatically select + an appropriate theme, or set TW_THEME to one of the following: + $(notdir $(wildcard $(commands_recovery_local_path)/gui/theme/*_*)) +**************************************************************************** +endef +define TW_CUSTOM_THEME_WARNING_MSG + +**************************************************************************** + Could not find ui.xml for TW_CUSTOM_THEME: $(TW_CUSTOM_THEME) + Expected to find cutom theme's ui.xml at: + $(TWRP_THEME_LOC)/ui.xml + Please fix this or set TW_THEME to one of the following: + $(notdir $(wildcard $(commands_recovery_local_path)/gui/theme/*_*)) +**************************************************************************** +endef + TWRP_RES := $(commands_recovery_local_path)/gui/theme/common/fonts TWRP_RES += $(commands_recovery_local_path)/gui/theme/common/languages ifeq ($(TW_EXTRA_LANGUAGES),true) @@ -100,28 +121,44 @@ endif ifeq ($(TW_CUSTOM_THEME),) ifeq ($(TW_THEME),) ifeq ($(DEVICE_RESOLUTION),) - DEVICE_RESOLUTION := $(TARGET_SCREEN_WIDTH)x$(TARGET_SCREEN_HEIGHT) + GUI_WIDTH := $(TARGET_SCREEN_WIDTH) + GUI_HEIGHT := $(TARGET_SCREEN_HEIGHT) + else + SPLIT_DEVICE_RESOLUTION := $(subst x, ,$(DEVICE_RESOLUTION)) + GUI_WIDTH := $(word 1, $(SPLIT_DEVICE_RESOLUTION)) + GUI_HEIGHT := $(word 2, $(SPLIT_DEVICE_RESOLUTION)) + endif + + # Minimum resolution of 100x100 + # This also ensures GUI_WIDTH and GUI_HEIGHT are numbers + ifeq ($(shell test $(GUI_WIDTH) -ge 100; echo $$?),0) + ifeq ($(shell test $(GUI_HEIGHT) -ge 100; echo $$?),0) + ifeq ($(shell test $(GUI_WIDTH) -gt $(GUI_HEIGHT); echo $$?),0) + ifeq ($(shell test $(GUI_WIDTH) -ge 1280; echo $$?),0) + TW_THEME := landscape_hdpi + else + TW_THEME := landscape_mdpi + endif + else ifeq ($(shell test $(GUI_WIDTH) -lt $(GUI_HEIGHT); echo $$?),0) + ifeq ($(shell test $(GUI_WIDTH) -ge 720; echo $$?),0) + TW_THEME := portrait_hdpi + else + TW_THEME := portrait_mdpi + endif + else ifeq ($(shell test $(GUI_WIDTH) -eq $(GUI_HEIGHT); echo $$?),0) + # watch_hdpi does not yet exist + TW_THEME := watch_mdpi + endif endif - # 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 TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/theme/$(TW_THEME) + ifeq ($(wildcard $(TWRP_THEME_LOC)/ui.xml),) + $(warning $(TW_THEME_WARNING_MSG)) + $(error Theme selection failed; exiting) + endif + TWRP_RES += $(commands_recovery_local_path)/gui/theme/common/$(word 1,$(subst _, ,$(TW_THEME))).xml # for future copying of used include xmls and fonts: # UI_XML := $(TWRP_THEME_LOC)/ui.xml @@ -129,29 +166,19 @@ ifeq ($(TW_CUSTOM_THEME),) # TWRP_FONTS_TTF := $(shell xmllint --xpath '/recovery/resources/font/@filename' $(UI_XML)|sed -n 's/[^\"]*\"\([^\"]*\)\"[^\"]*/\1\n/gp'|sort|uniq)niq) else TWRP_THEME_LOC := $(TW_CUSTOM_THEME) -endif -TWRP_RES += $(TW_ADDITIONAL_RES) - -ifeq ($(wildcard $(TWRP_THEME_LOC)/ui.xml),) - $(warning ****************************************************************************) - ifeq ($(TW_CUSTOM_THEME),) - $(warning * TW_THEME is not valid: '$(TW_THEME)') - else - $(warning * TW_CUSTOM_THEME is not valid: '$(TW_CUSTOM_THEME)') + ifeq ($(wildcard $(TWRP_THEME_LOC)/ui.xml),) + $(warning $(TW_CUSTOM_THEME_WARNING_MSG)) + $(error Theme selection failed; exiting) endif - $(warning * Please choose an appropriate TW_THEME or create a new one for your device.) - $(warning * Available themes:) - $(warning * $(notdir $(wildcard $(commands_recovery_local_path)/gui/theme/*_*))) - $(warning ****************************************************************************) - $(error stopping) endif +TWRP_RES += $(TW_ADDITIONAL_RES) + TWRP_RES_GEN := $(intermediates)/twrp $(TWRP_RES_GEN): mkdir -p $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH) cp -fr $(TWRP_RES) $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH) cp -fr $(TWRP_THEME_LOC)/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH) - mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin/ LOCAL_GENERATED_SOURCES := $(TWRP_RES_GEN) LOCAL_SRC_FILES := twrp $(TWRP_RES_GEN) |