diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2012-04-30 11:27:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-30 11:27:28 -0700 |
| commit | a0310aed2f9facb517b57e538f81e6fb506c2d82 (patch) | |
| tree | d78d9174fa123a8c9844a0d59c7ee04fdea98966 /src | |
| parent | 28d4c4d0b2df6b297a5ca701cad7f83df864d9a7 (diff) | |
| parent | 87baee154396cba12d785d7657bab45fe9285c0f (diff) | |
| download | android_packages_apps_Snap-a0310aed2f9facb517b57e538f81e6fb506c2d82.tar.gz android_packages_apps_Snap-a0310aed2f9facb517b57e538f81e6fb506c2d82.tar.bz2 android_packages_apps_Snap-a0310aed2f9facb517b57e538f81e6fb506c2d82.zip | |
Merge "Fix black screen when viewing Gmail image file attachment. Bug: 6415848" into jb-dev
Diffstat (limited to 'src')
| -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 { |