Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c55ad6df authored by Tianjie Xu's avatar Tianjie Xu Committed by android-build-merger
Browse files

Merge "recovery text images: Use center_alignment for background texts" 

am: daf0839f

Change-Id: I6254204c012169e0030f8ba068f3c5f5feb2bb39
parents 2da41174 daf0839f

core/Makefile

+6 −5
Original line number Original line Diff line number Diff line
@@ -1619,12 +1619,13 @@ $(RECOVERY_INSTALLING_TEXT_FILE): PRIVATE_RESOURCE_DIR := $(resource_dir) 
$(RECOVERY_INSTALLING_TEXT_FILE): PRIVATE_IMAGE_GENERATOR_JAR := $(image_generator_jar)

$(RECOVERY_INSTALLING_TEXT_FILE): PRIVATE_IMAGE_GENERATOR_JAR := $(image_generator_jar)

$(RECOVERY_INSTALLING_TEXT_FILE): PRIVATE_ZOPFLIPNG := $(zopflipng)

$(RECOVERY_INSTALLING_TEXT_FILE): PRIVATE_ZOPFLIPNG := $(zopflipng)

$(RECOVERY_INSTALLING_TEXT_FILE): PRIVATE_RECOVERY_IMAGE_WIDTH := $(recovery_image_width)

$(RECOVERY_INSTALLING_TEXT_FILE): PRIVATE_RECOVERY_IMAGE_WIDTH := $(recovery_image_width)

$(RECOVERY_INSTALLING_TEXT_FILE): PRIVATE_RECOVERY_TEXT_LIST := \

$(RECOVERY_INSTALLING_TEXT_FILE): PRIVATE_RECOVERY_BACKGROUND_TEXT_LIST := \

  recovery_installing \

  recovery_installing \

  recovery_installing_security \

  recovery_installing_security \

  recovery_erasing \

  recovery_erasing \

  recovery_error \

  recovery_error \

  recovery_no_command \

  recovery_no_command

$(RECOVERY_INSTALLING_TEXT_FILE): PRIVATE_RECOVERY_WIPE_DATA_TEXT_LIST := \

  recovery_cancel_wipe_data \

  recovery_cancel_wipe_data \

  recovery_factory_data_reset \

  recovery_factory_data_reset \

  recovery_try_again \

  recovery_try_again \
@@ -1636,17 +1637,17 @@ $(RECOVERY_INSTALLING_TEXT_FILE): $(image_generator_jar) $(resource_dir) $(recov 
	@rm -rf $(PRIVATE_RECOVERY_FONT_FILES_DIR)

	@rm -rf $(PRIVATE_RECOVERY_FONT_FILES_DIR)

	@mkdir -p $(PRIVATE_RECOVERY_FONT_FILES_DIR)

	@mkdir -p $(PRIVATE_RECOVERY_FONT_FILES_DIR)

	$(foreach filename,$(PRIVATE_SOURCE_FONTS), cp $(filename) $(PRIVATE_RECOVERY_FONT_FILES_DIR) &&) true

	$(foreach filename,$(PRIVATE_SOURCE_FONTS), cp $(filename) $(PRIVATE_RECOVERY_FONT_FILES_DIR) &&) true



	@rm -rf $(dir $@)

	@rm -rf $(dir $@)

	@mkdir -p $(dir $@)

	@mkdir -p $(dir $@)

	$(foreach text_name,$(PRIVATE_RECOVERY_TEXT_LIST), \

	$(foreach text_name,$(PRIVATE_RECOVERY_BACKGROUND_TEXT_LIST) $(PRIVATE_RECOVERY_WIPE_DATA_TEXT_LIST), \

	  $(eval output_file := $(dir $@)/$(patsubst recovery_%,%_text.png,$(text_name))) \

	  $(eval output_file := $(dir $@)/$(patsubst recovery_%,%_text.png,$(text_name))) \

	  $(eval center_alignment := $(if $(filter $(text_name),$(PRIVATE_RECOVERY_BACKGROUND_TEXT_LIST)), --center_alignment)) \

	  java -jar $(PRIVATE_IMAGE_GENERATOR_JAR) \

	  java -jar $(PRIVATE_IMAGE_GENERATOR_JAR) \

	    --image_width $(PRIVATE_RECOVERY_IMAGE_WIDTH) \

	    --image_width $(PRIVATE_RECOVERY_IMAGE_WIDTH) \

	    --text_name $(text_name) \

	    --text_name $(text_name) \

	    --font_dir $(PRIVATE_RECOVERY_FONT_FILES_DIR) \

	    --font_dir $(PRIVATE_RECOVERY_FONT_FILES_DIR) \

	    --resource_dir $(PRIVATE_RESOURCE_DIR) \

	    --resource_dir $(PRIVATE_RESOURCE_DIR) \

	    --output_file $(output_file) && \

	    --output_file $(output_file) $(center_alignment) && \

	  $(PRIVATE_ZOPFLIPNG) -y --iterations=1 --filters=0 $(output_file) $(output_file) > /dev/null &&) true

	  $(PRIVATE_ZOPFLIPNG) -y --iterations=1 --filters=0 $(output_file) $(output_file) > /dev/null &&) true

else

else

RECOVERY_INSTALLING_TEXT_FILE :=

RECOVERY_INSTALLING_TEXT_FILE :=