summaryrefslogtreecommitdiffstats
path: root/cmds/bootanimation
diff options
context:
space:
mode:
authorChris Elliott <chriselliott@google.com>2015-05-07 17:06:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-07 17:06:47 +0000
commitb65b66ccc251371c817abe75176a73f84565410e (patch)
tree000e3ae2151dc5c85e23a5b9e3b7096ffd3f3f24 /cmds/bootanimation
parentb53420d02def4277cf5b8a04da289b4291a9f24a (diff)
parent2224eac30375a731f4ad38d6930dbc37b0855a0d (diff)
downloadframeworks_base-b65b66ccc251371c817abe75176a73f84565410e.zip
frameworks_base-b65b66ccc251371c817abe75176a73f84565410e.tar.gz
frameworks_base-b65b66ccc251371c817abe75176a73f84565410e.tar.bz2
am 2224eac3: Merge "bootanimation: fix garbage line issue when screen height is odd." into lmp-mr1-modular-dev
* commit '2224eac30375a731f4ad38d6930dbc37b0855a0d': bootanimation: fix garbage line issue when screen height is odd.
Diffstat (limited to 'cmds/bootanimation')
-rw-r--r--cmds/bootanimation/BootAnimation.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index bb25ec6..21dc1e2 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -630,7 +630,10 @@ bool BootAnimation::movie()
}
glDisable(GL_SCISSOR_TEST);
}
- glDrawTexiOES(xc, yc, 0, animation.width, animation.height);
+ // specify the y center as ceiling((mHeight - animation.height) / 2)
+ // which is equivalent to mHeight - (yc + animation.height)
+ glDrawTexiOES(xc, mHeight - (yc + animation.height),
+ 0, animation.width, animation.height);
eglSwapBuffers(mDisplay, mSurface);
nsecs_t now = systemTime();