Improve compatibility of testGetMemoryClass

The configuration screen size is the available space for apps,
so it is not the same as physical display size.

As the current definition of screenHeightDp:
 The height of the available screen space in dp units excluding the
 area occupied by window insets,such as the status bar, navigation bar,
 and cutouts.

Since screenLayout is calculated from screenHeightDp and screenWidthDp,
the result can be different depending on the orientation and how the
insets occupied the space. So this change adds a tolerance from the
insets size to be able to use a smaller screen size definition. Then
a lower memory size can be chosen as the assertion target.

E.g. when density is 400
XLARGE is 288m, LARGE is 192m.
The device usually sets dalvik.vm.heapgrowthlimit=256m
Then the case can be passed by 256>192

Bug: 310820325
Test: atest CtsAppTestCases:ActivityManagerMemoryClassTest
      If is is on a device with density 400, then
        adb shell wm size 1800x2800
      If is is on a device with density 420, then
        adb shell wm size 1890x2800 (i.e. short side is ~720dp)
      The test should pass when putting the device in portrait.

Change-Id: Ie8e38340dc3e08e541c7aa8f80161fcb8de63ee3

Author: Riddle Hsu

tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java

@@ -22,9 +22,12 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
+import android.graphics.Insets;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.Display;
+import android.view.WindowInsets;
 import android.view.WindowManager;
 
 import androidx.test.uiautomator.UiDevice;
@@ -247,7 +250,30 @@ private int getScreenDensity() {
     private int getScreenSize() {
         Context context = getInstrumentation().getTargetContext();
         Configuration config = context.getResources().getConfiguration();
-        return config.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
+        final int configScreenSize = config.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
+        final int minScreenSizeDp = Math.min(config.screenWidthDp, config.screenHeightDp);
+        // The insets size may affect screenSizeDp in different orientations. E.g., the short side
+        // is 720dp as the width in portrait orientation, but when the short side is the height in
+        // landscape orientation, the value will be smaller than 720dp because the insets of
+        // system bars may occupy a little space. Then the screen size from Configuration will be
+        // LARGE in landscape and XLARGE in portrait. So below calculation allows to return a
+        // smaller size definition if the size excluding insets is lower than the size threshold.
+        final Insets insets = getActivity().getWindowManager().getCurrentWindowMetrics()
+                .getWindowInsets().getInsetsIgnoringVisibility(WindowInsets.Type.systemBars());
+        final int insetsSize = Math.max(insets.top + insets.bottom, insets.left + insets.right);
+        final int toleranceSizeDp = (int) (insetsSize /
+                ((float) config.densityDpi / DisplayMetrics.DENSITY_DEFAULT) + 0.5f);
+        Log.i("ActivityManagerMemoryClassTest", "getScreenSize: config=" + config
+                + " insets=" + insets + " toleranceSizeDp=" + toleranceSizeDp);
+        if (configScreenSize == Configuration.SCREENLAYOUT_SIZE_XLARGE
+                && (minScreenSizeDp - toleranceSizeDp < 720)) {
+            return Configuration.SCREENLAYOUT_SIZE_LARGE;
+        }
+        if (configScreenSize == Configuration.SCREENLAYOUT_SIZE_LARGE
+                && (minScreenSizeDp - toleranceSizeDp < 480)) {
+            return Configuration.SCREENLAYOUT_SIZE_NORMAL;
+        }
+        return configScreenSize;
     }
 
     private void assertMemoryForScreenDensity(int memoryClass, int screenDensity, int screenSize) {