commit 3900a797145a1e25172e7ab01436fb729e11ca9e
author amt_masd_yu_guo <amt_masd_yu_guo@htc.com> Thu Feb 14 16:34:07 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Feb 14 16:34:07 2019 -0800
tree 9fa3e1800df66f9b27b48691cbdd40226383b0e6
parent 88eba0a15ea3073addc058a083ecfbbfd7d1f1df
parent 453c6d2bea40723e24e115d1f964bde91ba794a6

Merge "Update CtsPreference2TestCases to prevent test app in landscape mode will fail" into pie-cts-dev
am: 453c6d2bea

Change-Id: I29f695ab1975131cad1d88f1cd9eabe49c311760

tests/tests/preference2/src/android/preference2/cts/TestUtils.java

diff --git a/tests/tests/preference2/src/android/preference2/cts/TestUtils.java b/tests/tests/preference2/src/android/preference2/cts/TestUtils.java
index e00e658..dd25f59 100644
--- a/tests/tests/preference2/src/android/preference2/cts/TestUtils.java
+++ b/tests/tests/preference2/src/android/preference2/cts/TestUtils.java
@@ -69,10 +69,16 @@
         // Crop the right side for scrollbar which might or might not be visible. On wearable
         // devices the scroll bar is a curve and occupies 20% of the right side.
         int xToCut = isOnWatchUiMode() ? bt.getWidth() / 5 : bt.getWidth() / 20;
+        int yToCut = statusBarHeight;
+
+        if (isLandscape()) {
+            xToCut += navigationBarHeight;
+        } else {
+            yToCut += navigationBarHeight;
+        }
 
         bt = Bitmap.createBitmap(
-                bt, 0, statusBarHeight, bt.getWidth() - xToCut,
-                bt.getHeight() - statusBarHeight - navigationBarHeight);
+                bt, 0, statusBarHeight, bt.getWidth() - xToCut, bt.getHeight() - yToCut);
 
         return bt;
     }
@@ -240,4 +246,9 @@
             throw new RuntimeException("Failed to run command: " + cmd, e);
         }
     }
+
+    private boolean isLandscape() {
+        return mInstrumentation.getTargetContext().getResources().getConfiguration().orientation ==
+                Configuration.ORIENTATION_LANDSCAPE;
+    }
 }