Skip PortraitAndLandscape test for all devices not supporting rotation.
Except PC, there are other devices cannot support rotation.
So change the precondition to check if device does support both landscape and portrait mode as other rotation tests did.
Bug: 278153759
Test: manual test in CtsVerifier.apk
Change-Id: I479e348b8e50bc630d9eb78db0301f7a37b6ddfa
Signed-off-by: TowaCJWang <towacjwang@foxconn.corp-partner.google.com>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/BubblesVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/BubblesVerifierActivity.java
index 80aab50..3646631 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/BubblesVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/BubblesVerifierActivity.java
@@ -21,7 +21,8 @@
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
import static android.content.Intent.ACTION_VIEW;
import static android.content.pm.PackageManager.FEATURE_INPUT_METHODS;
-import static android.content.pm.PackageManager.FEATURE_PC;
+import static android.content.pm.PackageManager.FEATURE_SCREEN_LANDSCAPE;
+import static android.content.pm.PackageManager.FEATURE_SCREEN_PORTRAIT;
import static android.view.View.GONE;
import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;
@@ -198,8 +199,10 @@
//
// Expanded view appearance
//
- // At the moment, PC devices do not support rotation
- if (!getPackageManager().hasSystemFeature(FEATURE_PC)) {
+ // Check if devices do not support rotation
+ if (getPackageManager().hasSystemFeature(FEATURE_SCREEN_LANDSCAPE) &&
+ getPackageManager().hasSystemFeature(FEATURE_SCREEN_PORTRAIT))
+ {
mTests.add(new PortraitAndLandscape());
}
mTests.add(new ScrimBehindExpandedView());
