summaryrefslogtreecommitdiffstats
path: root/cmds/bootanimation/BootAnimation.cpp
diff options
context:
space:
mode:
authorChris Elliott <chriselliott@google.com>2015-05-07 17:17:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-07 17:17:03 +0000
commit80f232deaee9fe4f69eaa5b8d355aac9bad7a291 (patch)
tree69914780c4aa24bb09c51339fb57e44e56d6baca /cmds/bootanimation/BootAnimation.cpp
parentb4b44378011b9935ddb6f3f18bf1b7d5f57e948b (diff)
parentb65b66ccc251371c817abe75176a73f84565410e (diff)
downloadframeworks_base-80f232deaee9fe4f69eaa5b8d355aac9bad7a291.zip
frameworks_base-80f232deaee9fe4f69eaa5b8d355aac9bad7a291.tar.gz
frameworks_base-80f232deaee9fe4f69eaa5b8d355aac9bad7a291.tar.bz2
am b65b66cc: am 2224eac3: Merge "bootanimation: fix garbage line issue when screen height is odd." into lmp-mr1-modular-dev
* commit 'b65b66ccc251371c817abe75176a73f84565410e': bootanimation: fix garbage line issue when screen height is odd.
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
-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();