Merge changes Ifc451f54,Ifefd3e56 into sc-dev
* changes: Cache set wallpaper as PNG instead of JPEG Only rescale wallpaper if its > display height
This commit is contained in:
committed by
Android (Google) Code Review
commit
0e8f141f4a
@@ -628,7 +628,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
|
||||
}
|
||||
|
||||
// scale if the crop height winds up not matching the recommended metrics
|
||||
needScale = wpData.mHeight != cropHint.height()
|
||||
needScale = cropHint.height() > wpData.mHeight
|
||||
|| cropHint.height() > GLHelper.getMaxTextureSize()
|
||||
|| cropHint.width() > GLHelper.getMaxTextureSize();
|
||||
|
||||
@@ -752,7 +752,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
|
||||
|
||||
f = new FileOutputStream(wallpaper.cropFile);
|
||||
bos = new BufferedOutputStream(f, 32*1024);
|
||||
finalCrop.compress(Bitmap.CompressFormat.JPEG, 100, bos);
|
||||
finalCrop.compress(Bitmap.CompressFormat.PNG, 100, bos);
|
||||
bos.flush(); // don't rely on the implicit flush-at-close when noting success
|
||||
success = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user