diff --git a/bootanimation/bootanimation.tar b/bootanimation/bootanimation.tar index 50e82bf0..95f6b4c3 100644 Binary files a/bootanimation/bootanimation.tar and b/bootanimation/bootanimation.tar differ diff --git a/bootanimation/generate-bootanimation.sh b/bootanimation/generate-bootanimation.sh index b5d8f198..5a30c39d 100755 --- a/bootanimation/generate-bootanimation.sh +++ b/bootanimation/generate-bootanimation.sh @@ -6,18 +6,21 @@ HALF_RES="$3" OUT="$ANDROID_PRODUCT_OUT/obj/BOOTANIMATION" if [ "$HEIGHT" -lt "$WIDTH" ]; then - SIZE="$HEIGHT" + IMAGEWIDTH="$HEIGHT" else - SIZE="$WIDTH" + IMAGEWIDTH="$WIDTH" fi +IMAGESCALEWIDTH="$IMAGEWIDTH" +IMAGESCALEHEIGHT=$(expr $IMAGESCALEWIDTH / 3) + if [ "$HALF_RES" = "true" ]; then - IMAGESIZE=$(expr $SIZE / 2) -else - IMAGESIZE="$SIZE" + IMAGEWIDTH=$(expr $IMAGEWIDTH / 2) fi -RESOLUTION=""$IMAGESIZE"x"$IMAGESIZE"" +IMAGEHEIGHT=$(expr $IMAGEWIDTH / 3) + +RESOLUTION=""$IMAGEWIDTH"x"$IMAGEHEIGHT"" for part_cnt in 0 1 2 do @@ -26,7 +29,7 @@ done tar xfp "vendor/cm/bootanimation/bootanimation.tar" --to-command="convert - -resize '$RESOLUTION' \"png8:$OUT/bootanimation/\$TAR_FILENAME\"" # Create desc.txt -echo "$SIZE" "$SIZE" 30 > "$OUT/bootanimation/desc.txt" +echo "$IMAGESCALEWIDTH $IMAGESCALEHEIGHT" 30 > "$OUT/bootanimation/desc.txt" cat "vendor/cm/bootanimation/desc.txt" >> "$OUT/bootanimation/desc.txt" # Create bootanimation.zip diff --git a/config/common.mk b/config/common.mk index b03299a9..56712833 100644 --- a/config/common.mk +++ b/config/common.mk @@ -90,6 +90,10 @@ include vendor/cm/config/themes_common.mk # CMSDK include vendor/cm/config/cmsdk_common.mk +# Bootanimation +PRODUCT_PACKAGES += \ + bootanimation.zip + # Required CM packages PRODUCT_PACKAGES += \ CMAudioService \