Skip to content

Commit 213c881

Browse files
authored
Switch to android15 over google emulators (#8142)
1 parent 983d4d6 commit 213c881

File tree

5 files changed

+9
-15
lines changed

5 files changed

+9
-15
lines changed

e2e/Overlay.test.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,15 @@ describe('Overlay', () => {
5858

5959
it.e2e(':android: should show banner overlay and not block the screen', async () => {
6060
const snapshottedImagePath = './e2e/assets/overlay_banner_padding.png';
61+
6162
Android.setDemoMode();
63+
6264
let expected = await device.takeScreenshot('without_banner');
6365
await elementById(TestIDs.SHOW_BANNER_OVERLAY).tap();
6466
await expect(elementById(TestIDs.BANNER_OVERLAY)).toBeVisible();
6567
const actual = await device.takeScreenshot('with_banner');
6668
expectImagesToBeNotEqual(expected, actual)
69+
6770
await elementById(TestIDs.SET_LAYOUT_BOTTOM_INSETS).tap();
6871
expected = await device.takeScreenshot('with_banner');
6972
expectImagesToBeEqual(expected, snapshottedImagePath)
783 Bytes
Loading

package.json

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -162,16 +162,10 @@
162162
"os": "15.5"
163163
}
164164
},
165-
"genymotion.emulator.name": {
166-
"type": "android.genycloud",
167-
"device": {
168-
"recipeUUID": "9baf12f9-a645-4ffa-a688-0e92584d6194"
169-
}
170-
},
171165
"emulator": {
172166
"type": "android.emulator",
173167
"device": {
174-
"avdName": "Pixel_3a_API_34"
168+
"avdName": "Pixel_3a_API_35"
175169
}
176170
}
177171
},
@@ -246,10 +240,6 @@
246240
"android.emu.release": {
247241
"app": "android.release",
248242
"device": "emulator"
249-
},
250-
"android.genycloud.release": {
251-
"app": "android.release",
252-
"device": "genymotion.emulator.name"
253243
}
254244
}
255245
},
@@ -258,4 +248,4 @@
258248
"type": "all",
259249
"jsSrcsDir": "./lib/src"
260250
}
261-
}
251+
}

playground/android/app/src/main/res/values/styles.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
<resources>
33
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
44
<item name="android:windowBackground">@color/backgroundColor</item>
5+
<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
56
</style>
67
</resources>

scripts/test-e2e.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ const CI = includes(process.argv, '--ci');
1212
run();
1313

1414
function run() {
15-
const prefix = android ? (CI ? `android.genycloud` : `android.emu`) : `ios.sim`;
16-
const suffix = release ? `release` : `debug`;
15+
const prefix = android ? 'android.emu' : 'ios.sim';
16+
const suffix = release ? 'release' : 'debug';
1717
const configuration = `${prefix}.${suffix}`;
18-
const headless$ = android ? (headless ? `--headless` : ``) : ``;
18+
const headless$ = android ? (headless ? '--headless' : '') : '';
1919
const workers = multi ? 3 : 1;
2020
const loglevel = verbose ? '--loglevel verbose' : '';
2121

0 commit comments

Comments
 (0)