diff options
13 files changed, 2 insertions, 70 deletions
diff --git a/android/src/com/android/tools/idea/avdmanager/DeviceSkinUpdater.java b/android/src/com/android/tools/idea/avdmanager/DeviceSkinUpdater.java index da95386ffe6..6a0b956d6dd 100644 --- a/android/src/com/android/tools/idea/avdmanager/DeviceSkinUpdater.java +++ b/android/src/com/android/tools/idea/avdmanager/DeviceSkinUpdater.java @@ -193,10 +193,6 @@ final class DeviceSkinUpdater { return myStudioSkins.resolve("wearos_square"); } - if (device.equals(device.getFileSystem().getPath("WearRect"))) { - return myStudioSkins.resolve("wearos_rect"); - } - return myStudioSkins.resolve(device); } diff --git a/android/src/com/android/tools/idea/configurations/DeviceMenuAction2.kt b/android/src/com/android/tools/idea/configurations/DeviceMenuAction2.kt index 36a3bf330ad..b2419691670 100644 --- a/android/src/com/android/tools/idea/configurations/DeviceMenuAction2.kt +++ b/android/src/com/android/tools/idea/configurations/DeviceMenuAction2.kt @@ -48,7 +48,7 @@ private val NEXUS_DEVICE_FILTER: (Map<DeviceGroup, List<Device>>) -> List<Device private val WEAR_DEVICE_FILTER: (Map<DeviceGroup, List<Device>>) -> List<Device> = { groupedDevices -> groupedDevices[DeviceGroup.WEAR]?.filter { when (it.id) { - "wearos_large_round", "wearos_small_round", "wearos_square", "wearos_rect" -> true + "wearos_large_round", "wearos_small_round", "wearos_square" -> true else -> false } }?.toList() ?: emptyList() diff --git a/android/testSrc/com/android/tools/idea/configurations/DeviceMenuAction2Test.kt b/android/testSrc/com/android/tools/idea/configurations/DeviceMenuAction2Test.kt index d9112e9446d..019fedb3239 100644 --- a/android/testSrc/com/android/tools/idea/configurations/DeviceMenuAction2Test.kt +++ b/android/testSrc/com/android/tools/idea/configurations/DeviceMenuAction2Test.kt @@ -103,7 +103,6 @@ class DeviceMenuAction2Test { ------------------------------------------------------ Wear Wear OS Small Round (192 × 192 dp, xhdpi) - Wear OS Rectangular (201 × 238 dp, xhdpi) Wear OS Square (180 × 180 dp, xhdpi) Wear OS Large Round (227 × 227 dp, xhdpi) ------------------------------------------------------ diff --git a/android/testSrc/com/android/tools/idea/configurations/DeviceMenuActionTest.java b/android/testSrc/com/android/tools/idea/configurations/DeviceMenuActionTest.java index 434e5a848f0..7887b034233 100644 --- a/android/testSrc/com/android/tools/idea/configurations/DeviceMenuActionTest.java +++ b/android/testSrc/com/android/tools/idea/configurations/DeviceMenuActionTest.java @@ -82,7 +82,6 @@ public class DeviceMenuActionTest extends AndroidTestCase { " ------------------------------------------------------\n" + " Wear\n" + " 384 \u00d7 384, xhdpi (Small Round)\n" + - " 402 \u00d7 476, xhdpi (Rectangular)\n" + " 360 \u00d7 360, xhdpi (Square)\n" + " 454 \u00d7 454, xhdpi (Large Round)\n" + " ------------------------------------------------------\n" + diff --git a/artwork/resources/device-art-resources/wearos_rect/device_bezel.png b/artwork/resources/device-art-resources/wearos_rect/device_bezel.png Binary files differdeleted file mode 100644 index 85425c5904f..00000000000 --- a/artwork/resources/device-art-resources/wearos_rect/device_bezel.png +++ /dev/null diff --git a/artwork/resources/device-art-resources/wearos_rect/hardware.ini b/artwork/resources/device-art-resources/wearos_rect/hardware.ini deleted file mode 100644 index 3f8ab78b83a..00000000000 --- a/artwork/resources/device-art-resources/wearos_rect/hardware.ini +++ /dev/null @@ -1,3 +0,0 @@ -# skin-specific hardware values -hw.rotaryInput=yes -hw.sensors.heart_rate=yes diff --git a/artwork/resources/device-art-resources/wearos_rect/layout b/artwork/resources/device-art-resources/wearos_rect/layout deleted file mode 100644 index fce46f31892..00000000000 --- a/artwork/resources/device-art-resources/wearos_rect/layout +++ /dev/null @@ -1,46 +0,0 @@ -parts { - portrait { - background { - image device_bezel.png - } - } - - device { - display { - width 402 - height 476 - x 0 - y 0 - } - } -} - -layouts { - portrait { - width 466 - height 540 - color 0x1f1f1f - event EV_SW:0:1 - - part1 { - name portrait - x 16 - y 16 - } - - part2 { - name device - x 32 - y 32 - } - } -} - -keyboard { - charmap qwerty2 -} - -network { - speed full - delay none -} diff --git a/emulator/src/com/android/tools/idea/emulator/SkinDefinition.kt b/emulator/src/com/android/tools/idea/emulator/SkinDefinition.kt index 9cf69b35370..f256f666366 100644 --- a/emulator/src/com/android/tools/idea/emulator/SkinDefinition.kt +++ b/emulator/src/com/android/tools/idea/emulator/SkinDefinition.kt @@ -431,7 +431,7 @@ class SkinDefinition private constructor(val layout: SkinLayout) { @JvmStatic private fun BufferedImage.cropped(cropBounds: Rectangle): BufferedImage { - return getCroppedImage(this, cropBounds, -1) + return getCroppedImage(this, cropBounds, -1) } @JvmStatic diff --git a/emulator/testSrc/com/android/tools/idea/emulator/SkinDefinitionTest.kt b/emulator/testSrc/com/android/tools/idea/emulator/SkinDefinitionTest.kt index f8416b4c7e4..ec72a0a69c1 100644 --- a/emulator/testSrc/com/android/tools/idea/emulator/SkinDefinitionTest.kt +++ b/emulator/testSrc/com/android/tools/idea/emulator/SkinDefinitionTest.kt @@ -214,7 +214,6 @@ class SkinDefinitionTest { "wearos_large_round", // TODO: Remove exclusion when the skin is fixed. "wearos_small_round", // TODO: Remove exclusion when the skin is fixed. "wearos_square", - "wearos_rect", ) val skinProblems = mutableListOf<String>() val dir = getRootSkinFolder() diff --git a/studio/tests/expected_linux.txt b/studio/tests/expected_linux.txt index 7ca872f5f25..8288a315394 100644 --- a/studio/tests/expected_linux.txt +++ b/studio/tests/expected_linux.txt @@ -2216,9 +2216,6 @@ android-studio/plugins/android/resources/device-art-resources/watch_square/shado android-studio/plugins/android/resources/device-art-resources/wearos_large_round/device_bezel.png android-studio/plugins/android/resources/device-art-resources/wearos_large_round/hardware.ini android-studio/plugins/android/resources/device-art-resources/wearos_large_round/layout -android-studio/plugins/android/resources/device-art-resources/wearos_rect/device_bezel.png -android-studio/plugins/android/resources/device-art-resources/wearos_rect/hardware.ini -android-studio/plugins/android/resources/device-art-resources/wearos_rect/layout android-studio/plugins/android/resources/device-art-resources/wearos_small_round/device_bezel.png android-studio/plugins/android/resources/device-art-resources/wearos_small_round/hardware.ini android-studio/plugins/android/resources/device-art-resources/wearos_small_round/layout diff --git a/studio/tests/expected_mac.txt b/studio/tests/expected_mac.txt index 9d9fd5e7f96..783ed297659 100644 --- a/studio/tests/expected_mac.txt +++ b/studio/tests/expected_mac.txt @@ -2217,9 +2217,6 @@ Android Studio Preview.app/Contents/plugins/android/resources/device-art-resourc Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_large_round/device_bezel.png Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_large_round/hardware.ini Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_large_round/layout -Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_rect/device_bezel.png -Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_rect/hardware.ini -Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_rect/layout Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_small_round/device_bezel.png Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_small_round/hardware.ini Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_small_round/layout diff --git a/studio/tests/expected_mac_arm.txt b/studio/tests/expected_mac_arm.txt index d703fedd976..f0cbf939a0b 100644 --- a/studio/tests/expected_mac_arm.txt +++ b/studio/tests/expected_mac_arm.txt @@ -2227,9 +2227,6 @@ Android Studio Preview.app/Contents/plugins/android/resources/device-art-resourc Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_large_round/device_bezel.png Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_large_round/hardware.ini Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_large_round/layout -Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_rect/device_bezel.png -Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_rect/hardware.ini -Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_rect/layout Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_small_round/device_bezel.png Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_small_round/hardware.ini Android Studio Preview.app/Contents/plugins/android/resources/device-art-resources/wearos_small_round/layout diff --git a/studio/tests/expected_win.txt b/studio/tests/expected_win.txt index ab5dcef49ec..c146cecece2 100644 --- a/studio/tests/expected_win.txt +++ b/studio/tests/expected_win.txt @@ -1654,9 +1654,6 @@ android-studio/plugins/android/resources/device-art-resources/watch_square/shado android-studio/plugins/android/resources/device-art-resources/wearos_large_round/device_bezel.png android-studio/plugins/android/resources/device-art-resources/wearos_large_round/hardware.ini android-studio/plugins/android/resources/device-art-resources/wearos_large_round/layout -android-studio/plugins/android/resources/device-art-resources/wearos_rect/device_bezel.png -android-studio/plugins/android/resources/device-art-resources/wearos_rect/hardware.ini -android-studio/plugins/android/resources/device-art-resources/wearos_rect/layout android-studio/plugins/android/resources/device-art-resources/wearos_small_round/device_bezel.png android-studio/plugins/android/resources/device-art-resources/wearos_small_round/hardware.ini android-studio/plugins/android/resources/device-art-resources/wearos_small_round/layout |
