summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-05-21 10:14:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-21 10:14:11 -0700
commitbfce0515165aa381b730b4dd772132c41dea4e28 (patch)
tree175e01d8a018ad71cddb4621ca1581e48c9495e4 /src
parentc6038e29aea5012a8c342d1a4c72aa26a9895519 (diff)
parentaa77f39a3a18ee7945177189c358ef6208e6da2b (diff)
downloadandroid_packages_apps_Gallery2-bfce0515165aa381b730b4dd772132c41dea4e28.tar.gz
android_packages_apps_Gallery2-bfce0515165aa381b730b4dd772132c41dea4e28.tar.bz2
android_packages_apps_Gallery2-bfce0515165aa381b730b4dd772132c41dea4e28.zip
am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce
* commit 'aa77f39a3a18ee7945177189c358ef6208e6da2b': Fix camera controls blink on startup
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/ui/PhotoView.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 5c8ac1c3e..7afa20348 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -1423,6 +1423,11 @@ public class PhotoView extends GLView {
@Override
protected void render(GLCanvas canvas) {
+ if (mFirst) {
+ // Make sure the fields are properly initialized before checking
+ // whether isCamera()
+ mPictures.get(0).reload();
+ }
// Check if the camera preview occupies the full screen.
boolean full = !mFilmMode && mPictures.get(0).isCamera()
&& mPositionController.isCenter()