Merge "Disable ActivityKeyboardShortcutsTest on watches." into oc-dev
diff --git a/tests/app/src/android/app/cts/ActivityKeyboardShortcutsTest.java b/tests/app/src/android/app/cts/ActivityKeyboardShortcutsTest.java
index cae15b1..7f5c49c 100644
--- a/tests/app/src/android/app/cts/ActivityKeyboardShortcutsTest.java
+++ b/tests/app/src/android/app/cts/ActivityKeyboardShortcutsTest.java
@@ -17,6 +17,7 @@
package android.app.cts;
import android.app.stubs.KeyboardShortcutsActivity;
+import android.content.pm.PackageManager;
import android.test.ActivityInstrumentationTestCase2;
import android.view.KeyEvent;
import android.view.KeyboardShortcutGroup;
@@ -51,6 +52,9 @@
* from an overflow menu (options menu in the test)
*/
public void testRequestShowKeyboardShortcuts() throws InterruptedException {
+ if (!keyboardShortcutsSupported()) {
+ return;
+ }
// Open activity's options menu
mActivity.openOptionsMenu();
mActivity.waitForMenuToBeOpen();
@@ -68,6 +72,9 @@
}
public void testOnProvideKeyboardShortcuts() {
+ if (!keyboardShortcutsSupported()) {
+ return;
+ }
List<KeyboardShortcutGroup> data = new ArrayList<>();
mActivity.onCreateOptionsMenu(mMenu);
mActivity.onProvideKeyboardShortcuts(data, mMenu, -1);
@@ -80,4 +87,10 @@
data.get(0).getItems().get(0).getBaseCharacter());
assertEquals(KeyEvent.META_CTRL_ON, data.get(0).getItems().get(0).getModifiers());
}
+
+ private boolean keyboardShortcutsSupported() {
+ // Keyboard shortcuts API is not supported on watches.
+ // TODO(b/62257073): Provide a more granular feature to check here.
+ return !mActivity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH);
+ }
}