Merge pull request #1554 from rmartin16/android-emu-skin-default

Use Pixel 7 Pro skin for new AVDs
beeware · Nov 28, 2023 · 96ea29e · 96ea29e
2 parents 018931b + 32b57c1
commit 96ea29e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/changes/1554.feature.rst b/changes/1554.feature.rst
@@ -0,0 +1 @@
+New virtual devices for the Android emulator are created using the Pixel 7 Pro skin.
diff --git a/src/briefcase/integrations/android_sdk.py b/src/briefcase/integrations/android_sdk.py
@@ -168,7 +168,7 @@ def DEFAULT_DEVICE_TYPE(self) -> str:
 
     @property
     def DEFAULT_DEVICE_SKIN(self) -> str:
-        return "pixel_3a"
+        return "pixel_7_pro"
 
     @property
     def DEFAULT_SYSTEM_IMAGE(self) -> str:

diff --git a/tests/integrations/android_sdk/AndroidSDK/test__create_emulator.py b/tests/integrations/android_sdk/AndroidSDK/test__create_emulator.py
@@ -156,7 +156,7 @@ def test_create_emulator_with_defaults(
     )
 
     # The emulator skin was verified
-    android_sdk.verify_emulator_skin.assert_called_once_with("pixel_3a")
+    android_sdk.verify_emulator_skin.assert_called_once_with("pixel_7_pro")
 
     # avdmanager was invoked
     mock_tools.subprocess.check_output.assert_called_once_with(
@@ -181,7 +181,7 @@ def test_create_emulator_with_defaults(
     with avd_config_path.open(encoding="utf-8") as f:
         config = f.read().split("\n")
     assert "hw.keyboard=yes" in config
-    assert "skin.name=pixel_3a" in config
+    assert "skin.name=pixel_7_pro" in config
 
 
 def test_create_failure(mock_tools, android_sdk):
@@ -203,7 +203,7 @@ def test_create_failure(mock_tools, android_sdk):
     android_sdk.verify_system_image.assert_called_once_with(ANY)
 
     # The emulator skin was verified
-    android_sdk.verify_emulator_skin.assert_called_once_with("pixel_3a")
+    android_sdk.verify_emulator_skin.assert_called_once_with("pixel_7_pro")
 
     # avdmanager was invoked
     mock_tools.subprocess.check_output.assert_called_once_with(

diff --git a/tests/integrations/android_sdk/AndroidSDK/test_create_emulator.py b/tests/integrations/android_sdk/AndroidSDK/test_create_emulator.py
@@ -83,7 +83,7 @@ def test_create_emulator(
     android_sdk._create_emulator.assert_called_once_with(
         avd="new-emulator",
         device_type="pixel",
-        skin="pixel_3a",
+        skin="pixel_7_pro",
         system_image=f"system-images;android-31;default;{emulator_abi}",
     )