commit 58ed4d197795147f9f4a202da00b411a6ed53bd2
author Doris Liu <tianliu@google.com> Mon May 20 15:21:05 2013 -0700
committer Doris Liu <tianliu@google.com> Mon May 20 15:21:05 2013 -0700
tree 61c0f46cbd00ba18ce5e4c47dcfda7a84e903e0a
parent 286afab10fb4c528ea503981c4f1bdbcfbdbde77

Fix camera controls blink on startup

Bug: 9052837
Change-Id: Ie15b812c6e6e7879d29d96a345173a2130b2fe91

src/com/android/gallery3d/ui/PhotoView.java

diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 5c8ac1c..7afa203 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -1423,6 +1423,11 @@
 
     @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()