diff options
| author | Doris Liu <tianliu@google.com> | 2013-05-21 17:12:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-21 17:12:03 +0000 |
| commit | 4a0676ce905ace0eb8dcac4bfd9bce8da0884298 (patch) | |
| tree | c80fe9777c701ab907542675228c01d3430313be | |
| parent | 9eb37145df8adfb0bd68e9023342f5c7a4d12d31 (diff) | |
| parent | f22ed280bae246a4b9ce31e5fada68a30f211aed (diff) | |
| download | android_packages_apps_Snap-4a0676ce905ace0eb8dcac4bfd9bce8da0884298.tar.gz android_packages_apps_Snap-4a0676ce905ace0eb8dcac4bfd9bce8da0884298.tar.bz2 android_packages_apps_Snap-4a0676ce905ace0eb8dcac4bfd9bce8da0884298.zip | |
Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce
| -rw-r--r-- | src/com/android/gallery3d/ui/PhotoView.java | 5 |
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() |