From f22ed280bae246a4b9ce31e5fada68a30f211aed Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Mon, 20 May 2013 15:21:05 -0700
Subject: Fix camera controls blink on startup

Bug: 9052837
Change-Id: Ie15b812c6e6e7879d29d96a345173a2130b2fe91
---
 src/com/android/gallery3d/ui/PhotoView.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/com')

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()
-- 
cgit v1.2.3