| commit | d8a37c29124291f04d1a1f6a97adcc24be636977 | [log] [tgz] |
|---|---|---|
| author | maxwen <max.weninger@gmail.com> | Thu Apr 02 14:44:28 2015 +0200 |
| committer | Gerrit Code Review <gerrit2@gerrit> | Thu Apr 02 14:44:28 2015 +0200 |
| tree | e588e47457e90bffa04d3be1ea6db2cf90721dc6 | |
| parent | db8a46cbb7da5e07525abc3bebf100a44f5f3de4 [diff] | |
| parent | bf33b379a796c3c4859912cc40e75386d06838f3 [diff] |
Merge "vendor: omni: sepolicy update" into android-5.1
diff --git a/prebuilt/bin/backuptool.sh b/prebuilt/bin/backuptool.sh index a32594b..e72e462 100755 --- a/prebuilt/bin/backuptool.sh +++ b/prebuilt/bin/backuptool.sh
@@ -5,7 +5,7 @@ export C=/tmp/backupdir export S=/system -export V=5.0 +export V=5.1 # Preserve /system/addon.d in /tmp/addon.d preserve_addon_d() {
diff --git a/prebuilt/bootanimation/res/1080x720.zip b/prebuilt/bootanimation/res/1080x720.zip index cc12117..7e22741 100644 --- a/prebuilt/bootanimation/res/1080x720.zip +++ b/prebuilt/bootanimation/res/1080x720.zip Binary files differ
diff --git a/prebuilt/bootanimation/res/1440x960.zip b/prebuilt/bootanimation/res/1440x960.zip index d3dc477..752f8eb 100644 --- a/prebuilt/bootanimation/res/1440x960.zip +++ b/prebuilt/bootanimation/res/1440x960.zip Binary files differ
diff --git a/prebuilt/bootanimation/res/2560x1440.zip b/prebuilt/bootanimation/res/2560x1440.zip index 8f16834..77c7754 100644 --- a/prebuilt/bootanimation/res/2560x1440.zip +++ b/prebuilt/bootanimation/res/2560x1440.zip Binary files differ
diff --git a/prebuilt/bootanimation/res/360x240.zip b/prebuilt/bootanimation/res/360x240.zip index c21086f..7f8e828 100644 --- a/prebuilt/bootanimation/res/360x240.zip +++ b/prebuilt/bootanimation/res/360x240.zip Binary files differ
diff --git a/prebuilt/bootanimation/res/420x280.zip b/prebuilt/bootanimation/res/420x280.zip index 09848a0..5b154c8 100644 --- a/prebuilt/bootanimation/res/420x280.zip +++ b/prebuilt/bootanimation/res/420x280.zip Binary files differ
diff --git a/prebuilt/bootanimation/res/480x320.zip b/prebuilt/bootanimation/res/480x320.zip index 856e777..c339a8c 100644 --- a/prebuilt/bootanimation/res/480x320.zip +++ b/prebuilt/bootanimation/res/480x320.zip Binary files differ
diff --git a/prebuilt/bootanimation/res/720x480.zip b/prebuilt/bootanimation/res/720x480.zip index ed33459..4231848 100644 --- a/prebuilt/bootanimation/res/720x480.zip +++ b/prebuilt/bootanimation/res/720x480.zip Binary files differ
diff --git a/prebuilt/bootanimation/res/840x560.zip b/prebuilt/bootanimation/res/840x560.zip index 2290646..057a2d2 100644 --- a/prebuilt/bootanimation/res/840x560.zip +++ b/prebuilt/bootanimation/res/840x560.zip Binary files differ
diff --git a/prebuilt/bootanimation/res/960x640.zip b/prebuilt/bootanimation/res/960x640.zip index 3110565..8930225 100644 --- a/prebuilt/bootanimation/res/960x640.zip +++ b/prebuilt/bootanimation/res/960x640.zip Binary files differ
diff --git a/prebuilt/bootanimation/res/generate-packages.sh b/prebuilt/bootanimation/res/generate-packages.sh index 8448105..db0b626 100755 --- a/prebuilt/bootanimation/res/generate-packages.sh +++ b/prebuilt/bootanimation/res/generate-packages.sh
@@ -48,6 +48,9 @@ EOF } +# image quality +quality=50; + # reading images for i in ${RESOLUTIONS}; do @@ -68,17 +71,6 @@ echo "Rewriting desc.txt..."; rewrite_desc "${i}" -# set image quality -# add an aggressive value for low resolutions - case "${i}" in - "360x240"|"420x280"|"480x320") - quality=80; - ;; - *) - quality=90; - ;; - esac - echo "Resizing images..."; for j in Part*/*.jpg; do convert_image "${j}" "${i}" $quality;