From 49f329ca66e3cf06a8c6086b77333c68fef5cf5b Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Thu, 13 Feb 2020 16:41:32 +0800 Subject: 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 --- .../com/google/android/test/mirrorsurface/MirrorSurfaceActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/MirrorSurfaceTest') diff --git a/tests/MirrorSurfaceTest/src/com/google/android/test/mirrorsurface/MirrorSurfaceActivity.java b/tests/MirrorSurfaceTest/src/com/google/android/test/mirrorsurface/MirrorSurfaceActivity.java index 31532a226800..8afe8411a790 100644 --- a/tests/MirrorSurfaceTest/src/com/google/android/test/mirrorsurface/MirrorSurfaceActivity.java +++ b/tests/MirrorSurfaceTest/src/com/google/android/test/mirrorsurface/MirrorSurfaceActivity.java @@ -39,6 +39,7 @@ import android.view.WindowManagerGlobal; import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; +import android.window.WindowMetricsHelper; public class MirrorSurfaceActivity extends Activity implements View.OnClickListener, View.OnLongClickListener, View.OnTouchListener { @@ -89,7 +90,8 @@ public class MirrorSurfaceActivity extends Activity implements View.OnClickListe .getSystemService(WindowManager.class); mIWm = WindowManagerGlobal.getWindowManagerService(); - Rect windowBounds = mWm.getCurrentWindowMetrics().getBounds(); + Rect windowBounds = WindowMetricsHelper.getBoundsExcludingNavigationBarAndCutout( + mWm.getCurrentWindowMetrics()); mWindowBounds.set(0, 0, windowBounds.width(), windowBounds.height()); mScaleText = findViewById(R.id.scale); -- cgit v1.2.3-59-g8ed1b