diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2012-05-01 02:25:09 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2012-05-01 02:25:09 +0800 |
| commit | 87baee154396cba12d785d7657bab45fe9285c0f (patch) | |
| tree | b11cfca50c729f39c279f27ee0e03037ee6e50bb /src/com/android/gallery3d/ui/PositionController.java | |
| parent | 30acac409a65548312ca819e855e40bec1a65cce (diff) | |
| download | android_packages_apps_Snap-87baee154396cba12d785d7657bab45fe9285c0f.tar.gz android_packages_apps_Snap-87baee154396cba12d785d7657bab45fe9285c0f.tar.bz2 android_packages_apps_Snap-87baee154396cba12d785d7657bab45fe9285c0f.zip | |
Fix black screen when viewing Gmail image file attachment.
Bug: 6415848
Change-Id: Iec369866be6b5546fbd8cb77eb95a29f92e00b84
Diffstat (limited to 'src/com/android/gallery3d/ui/PositionController.java')
| -rw-r--r-- | src/com/android/gallery3d/ui/PositionController.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/ui/PositionController.java b/src/com/android/gallery3d/ui/PositionController.java index ac0d191f4..03fe65b1c 100644 --- a/src/com/android/gallery3d/ui/PositionController.java +++ b/src/com/android/gallery3d/ui/PositionController.java @@ -1012,7 +1012,8 @@ class PositionController { float hFactor = 1.0f; int viewW, viewH; - if (!mFilmMode && mConstrained && b == mBoxes.get(0)) { + if (!mFilmMode && mConstrained && !mConstrainedFrame.isEmpty() + && b == mBoxes.get(0)) { viewW = mConstrainedFrame.width(); viewH = mConstrainedFrame.height(); } else { |