Fix topBar button colors on iOS 13 (#5690)

e2e/AndroidUtils.js

@@ -1,37 +1,13 @@
 const exec = require('shell-utils').exec;
-
-module.exports = {
-  pressBack: () => {
-    exec.execSync('adb shell input keyevent 4');
-  },
-  pressMenu: () => {
-    exec.execSync('adb shell input keyevent 82');
-  },
-  pressEnter: (keyCode) => {
-    exec.execSync(`adb shell input keyevent 66`);
-  },
-  pressLockButton: () => {
-    exec.execSync(`adb shell input keyevent 26`);
-  },
-  pressKeyCode: (keyCode) => {
-    exec.execSync(`adb shell input keyevent ${keyCode}`);
-  },
-  grantPermission: () => {
-    exec.execSync('adb shell pm grant com.reactnativenavigation.playground android.permission.READ_PHONE_STATE');
-  },
-  revokePermission: () => {
-    exec.execSync('adb shell pm revoke com.reactnativenavigation.playground android.permission.READ_PHONE_STATE');
-  },
-  openActivity: () => {
-    exec.execSync('adb shell am start -n com.reactnativenavigation.playground/.MainActivity');
-  },
+const utils = {
+  pressBack: () => utils.pressKeyCode(4),
+  pressMenu: () => utils.pressKeyCode(82),
+  pressKeyCode: (keyCode) => utils.executeShellCommand(`input keyevent ${keyCode}`),
+  grantPermission: () => utils.executeShellCommand('pm grant com.reactnativenavigation.playground android.permission.READ_PHONE_STATE'),
+  revokePermission: () => utils.executeShellCommand('pm revoke com.reactnativenavigation.playground android.permission.READ_PHONE_STATE'),
   executeShellCommand: (command) => {
-    exec.execSync(`adb shell ${command}`);
+    exec.execSync(`adb -s ${device.id} shell ${command}`);
   },
-  enterText: (text) => {
-    exec.execSync(`adb shell input text ${text}`);
-  },
-  swipeUp: () => {
-    exec.execSync('adb shell input touchscreen swipe 300 1200 500 0 100');
-  }
 };
+
+module.exports = utils;

e2e/DeviceLocked.test.js

@@ -1,34 +0,0 @@
-const Utils = require('./Utils');
-const Android = require('./AndroidUtils');
-
-const { elementByLabel } = Utils;
-
-xdescribe(':android: Android phone locked tests', () => {
-  beforeEach(async () => {
-    await device.relaunchApp();
-  });
-
-  test('launch from locked screen', async () => {
-    await device.terminateApp();
-    await Android.pressLockButton();
-    await Android.pressLockButton();
-    await device.launchApp();
-    await Android.swipeUp();
-    // The device should be locked using PIN 1234
-    await Android.enterText('1234');
-    await Android.pressEnter();
-    await expect(elementByLabel('React Native Navigation!')).toBeVisible();
-  });
-
-  test('launch app from unlocked screen', async () => {
-    await device.terminateApp();
-    await Android.pressLockButton();
-    await Android.pressLockButton();
-    await Android.swipeUp();
-    // The device should be locked using PIN 1234
-    await Android.enterText('1234');
-    await Android.pressEnter();
-    await device.launchApp();
-    await expect(elementByLabel('React Native Navigation!')).toBeVisible();
-  });
-});

package.json

@@ -36,7 +36,6 @@
     "pretest-e2e-android": "npm run build",
     "test-e2e-android": "node ./scripts/test-e2e --android",
     "test-e2e-android-multi": "npm run test-e2e-android -- --multi",
-    "test-e2e-android-locked": "node ./scripts/test-e2e-android-locked",
     "pretest-e2e-ios": "npm run build",
     "test-e2e-ios": "node ./scripts/test-e2e --ios",
     "test-e2e-ios-multi": "npm run test-e2e-ios -- --multi",
@@ -158,18 +157,6 @@
         "build": "cd playground/android && ./gradlew app:assembleRelease app:assembleAndroidTest -DtestBuildType=release",
         "type": "android.emulator",
         "name": "Nexus_5X_API_26"
-      },
-      "android.emu.debug.locked": {
-        "binaryPath": "playground/android/app/build/outputs/apk/debug/app-debug.apk",
-        "build": "cd playground/android && ./gradlew app:assembleDebug app:assembleAndroidTest -DtestBuildType=debug",
-        "type": "android.emulator",
-        "name": "Nexus_5X_API_23"
-      },
-      "android.emu.release.locked": {
-        "binaryPath": "playground/android/app/build/outputs/apk/release/app-release.apk",
-        "build": "cd playground/android && ./gradlew app:assembleRelease app:assembleAndroidTest -DtestBuildType=release",
-        "type": "android.emulator",
-        "name": "Nexus_5X_API_23"
       }
     }
   }

scripts/test-e2e-android-locked.js

@@ -1,13 +0,0 @@
-const _ = require('lodash');
-const exec = require('shell-utils').exec;
-
-const release = _.includes(process.argv, '--release');
-
-run();
-
-function run() {
-    const suffix = release ? `release` : `debug`;
-    const configuration = `android.emu.${suffix}.locked`;
-
-    exec.execSync(`detox test --configuration ${configuration} -f "DeviceLocked.test.js"`)
-}