diff options
| author | Doris Liu <tianliu@google.com> | 2013-05-21 10:17:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-21 10:17:44 -0700 |
| commit | ef2d4a1d0fd6b2676c5b650dfbdba07b99528328 (patch) | |
| tree | f6ba96c74049d1ee6c45b5cbb4eaf139062f338b /src | |
| parent | a8d103b48174c9313aed9e4db026c1c19d7dd56c (diff) | |
| parent | bfce0515165aa381b730b4dd772132c41dea4e28 (diff) | |
| download | android_packages_apps_Gallery2-ef2d4a1d0fd6b2676c5b650dfbdba07b99528328.tar.gz android_packages_apps_Gallery2-ef2d4a1d0fd6b2676c5b650dfbdba07b99528328.tar.bz2 android_packages_apps_Gallery2-ef2d4a1d0fd6b2676c5b650dfbdba07b99528328.zip | |
am bfce0515: am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce
* commit 'bfce0515165aa381b730b4dd772132c41dea4e28':
Fix camera controls blink on startup
Diffstat (limited to 'src')
| -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() |