am 48c52bea: am bdac73fe: Merge "Fix default wallpaper dimensions" into klp-dev

* commit '48c52bea8b8b53e9e7d5e0db409a0ada8bd90d0d':
  Fix default wallpaper dimensions
This commit is contained in:
Michael Jurka
2013-09-20 11:21:23 -07:00
committed by Android Git Automerger

View File

@@ -138,12 +138,13 @@ public class WallpaperCropActivity extends Activity {
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