remove navigation bar related changes which break in some devices
Bug: 6949468
Change-Id: I71a148e9015dfd16cd8975a2f96efb03161c588b
diff --git a/tests/tests/dpi/src/android/dpi/cts/ConfigurationScreenLayoutTest.java b/tests/tests/dpi/src/android/dpi/cts/ConfigurationScreenLayoutTest.java
index f0372e9..45418cf 100644
--- a/tests/tests/dpi/src/android/dpi/cts/ConfigurationScreenLayoutTest.java
+++ b/tests/tests/dpi/src/android/dpi/cts/ConfigurationScreenLayoutTest.java
@@ -46,9 +46,6 @@
int expectedSize = expectedScreenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
int expectedLong = expectedScreenLayout & Configuration.SCREENLAYOUT_LONG_MASK;
- // Check if the device has the navigation bar.
- boolean navigationBar = hasNavigationBar();
-
// Check that all four orientations report the same configuration value.
for (int i = 0; i < ORIENTATIONS.length; i++) {
Activity activity = startOrientationActivity(ORIENTATIONS[i]);
@@ -56,15 +53,6 @@
int actualSize = mConfig.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
int actualLong = mConfig.screenLayout & Configuration.SCREENLAYOUT_LONG_MASK;
- if (navigationBar) {
- // Update screenLayout value if the device has the navigation bar.
- expectedScreenLayout = reduceScreenLayout(activity,
- Configuration.SCREENLAYOUT_SIZE_XLARGE
- | Configuration.SCREENLAYOUT_LONG_YES);
- expectedSize = expectedScreenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
- expectedLong = expectedScreenLayout & Configuration.SCREENLAYOUT_LONG_MASK;
- }
-
assertEquals("Expected screen size value of " + expectedSize + " but got " + actualSize
+ " for orientation " + ORIENTATIONS[i], expectedSize, actualSize);
assertEquals("Expected screen long value of " + expectedLong + " but got " + actualLong
@@ -93,11 +81,6 @@
return screenLayout;
}
- private boolean hasNavigationBar() {
- // Check if the device has a permanent menu key available.
- return !ViewConfiguration.get(getActivity()).hasPermanentMenuKey();
- }
-
private Activity startOrientationActivity(int orientation) {
Intent intent = new Intent();
intent.putExtra(OrientationActivity.EXTRA_ORIENTATION, orientation);
