diff options
| author | Charles Chen <charlesccchen@google.com> | 2020-02-13 16:41:32 +0800 |
|---|---|---|
| committer | Charles Chen <charlesccchen@google.com> | 2020-05-04 11:41:13 +0800 |
| commit | 49f329ca66e3cf06a8c6086b77333c68fef5cf5b (patch) | |
| tree | e0f253b3b905055bd548bd8490669f667113f990 /packages/WallpaperCropper | |
| parent | d827ec8bbd33aec9435575ce55776766e746cdf9 (diff) | |
Add WindowMetricsHelper
This metrics now is used for calculating the value reported by
Display#getSize. It could be extended to have more function later.
Also replace getCurrentMetrics usages to make them report
Display#getSize value.
Bug: 148904274
Test: atest WindowMetricsHelperTest
Change-Id: I182b6e63f7c28752eee22839cb9e69f073046c3f
Diffstat (limited to 'packages/WallpaperCropper')
| -rw-r--r-- | packages/WallpaperCropper/src/com/android/photos/views/TiledImageRenderer.java | 4 | ||||
| -rw-r--r-- | packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/WallpaperCropper/src/com/android/photos/views/TiledImageRenderer.java b/packages/WallpaperCropper/src/com/android/photos/views/TiledImageRenderer.java index 210fdc662bed..3e053d59ded4 100644 --- a/packages/WallpaperCropper/src/com/android/photos/views/TiledImageRenderer.java +++ b/packages/WallpaperCropper/src/com/android/photos/views/TiledImageRenderer.java @@ -20,9 +20,9 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.Rect; import android.graphics.RectF; -import android.util.LongSparseArray; import android.util.DisplayMetrics; import android.util.Log; +import android.util.LongSparseArray; import android.util.Pools.Pool; import android.util.Pools.SynchronizedPool; import android.view.View; @@ -163,7 +163,7 @@ public class TiledImageRenderer { private static boolean isHighResolution(Context context) { DisplayMetrics metrics = new DisplayMetrics(); - context.getDisplayNoVerify().getMetrics(metrics); + context.getDisplayNoVerify().getRealMetrics(metrics); return metrics.heightPixels > 2048 || metrics.widthPixels > 2048; } diff --git a/packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java b/packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java index fe9f60fe2859..d8184f2d169d 100644 --- a/packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java +++ b/packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java @@ -40,6 +40,7 @@ import android.util.Log; import android.view.Display; import android.view.View; import android.widget.Toast; +import android.window.WindowMetricsHelper; import com.android.gallery3d.common.Utils; import com.android.gallery3d.exif.ExifInterface; @@ -357,7 +358,8 @@ public class WallpaperCropActivity extends Activity { // Get the crop boolean ltr = mCropView.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR; - Rect windowBounds = getWindowManager().getCurrentWindowMetrics().getBounds(); + Rect windowBounds = WindowMetricsHelper.getBoundsExcludingNavigationBarAndCutout( + getWindowManager().getCurrentWindowMetrics()); boolean isPortrait = windowBounds.width() < windowBounds.height(); Point defaultWallpaperSize = getDefaultWallpaperSize(getResources(), |