Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Crop wallpaper image to preserve screen aspect ratio"

Browse Source
This commit is contained in:
Iavor-Valentin Iftime
2019-01-09 13:26:03 +00:00
committed by Android (Google) Code Review
parent e6707b8a02 3047bb1114
commit 3c8657e096
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -89,6 +89,7 @@ import android.util.SparseArray;
import android.util.SparseBooleanArray;
import android.util.Xml;
import android.view.Display;
import android.view.DisplayInfo;
import android.view.IWindowManager;
import com.android.internal.R;
@@ -600,6 +601,20 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
// scale if the crop height winds up not matching the recommended metrics
needScale = (wpData.mHeight != cropHint.height());
//make sure screen aspect ratio is preserved if width is scaled under screen size
if (needScale) {
final DisplayInfo displayInfo = new DisplayInfo();
mDisplayManager.getDisplay(DEFAULT_DISPLAY).getDisplayInfo(displayInfo);
final float scaleByHeight = (float) wpData.mHeight / (float) cropHint.height();
final int newWidth = (int) (cropHint.width() * scaleByHeight);
if (newWidth < displayInfo.logicalWidth) {
final float screenAspectRatio =
(float) displayInfo.logicalHeight / (float) displayInfo.logicalWidth;
cropHint.bottom = (int) (cropHint.width() * screenAspectRatio);
needCrop = true;
}
}
if (DEBUG) {
Slog.v(TAG, "crop: w=" + cropHint.width() + " h=" + cropHint.height());
Slog.v(TAG, "dims: w=" + wpData.mWidth + " h=" + wpData.mHeight);