commit 5b5c88171ec0b24553111465eb8e4484d58bcfab
author Michael Jurka <mikejurka@google.com> Fri Sep 20 02:28:53 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 20 02:28:53 2013 +0000
tree 3f16e926320b4a029f3ec480593532568f5828dd
parent f20e184eb58381266f572e9420bf5712358c222e
parent e8115d5664a6f72b7a2062280c1bcf5dd457ab90

Merge "Fix bug: wallpaper strip needed two taps to come back" into jb-ub-now-indigo-rose

src/com/android/launcher3/WallpaperCropActivity.java

diff --git a/src/com/android/launcher3/WallpaperCropActivity.java b/src/com/android/launcher3/WallpaperCropActivity.java
index f5a6b80..f359480 100644
--- a/src/com/android/launcher3/WallpaperCropActivity.java
+++ b/src/com/android/launcher3/WallpaperCropActivity.java
@@ -138,12 +138,13 @@
         windowManager.getDefaultDisplay().getCurrentSizeRange(minDims, maxDims);
 
         int maxDim = Math.max(maxDims.x, maxDims.y);
-        final int minDim = Math.min(minDims.x, minDims.y);
+        int minDim = Math.max(minDims.x, minDims.y);
 
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
             Point realSize = new Point();
             windowManager.getDefaultDisplay().getRealSize(realSize);
             maxDim = Math.max(realSize.x, realSize.y);
+            minDim = Math.min(realSize.x, realSize.y);
         }
 
         // We need to ensure that there is enough extra space in the wallpaper