From 67a6bbda575c6cf380be4fbfb318b57a0bbd6a59 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 7 Feb 2022 20:04:43 +0000 Subject: Revert "Add Wear OS Rectangular skin" Revert "Add Wear OS Rectangular skin" Revert submission 16365363 Reason for revert: Inappropriately modified the exclusion list in SkinDefinitioTest.testSkinConsistency to get the test to pass Reverted Changes: I8904c68df:Add Wear OS Rectangular skin If8ae2d123:Use new wear device configs for layout validator. I3eb6d88ab:Add Wear OS Rectangular skin Change-Id: Ibce48a3037c74e362f0f4c644d4d0510af5d2a17 --- emulator/src/com/android/tools/idea/emulator/SkinDefinition.kt | 2 +- emulator/testSrc/com/android/tools/idea/emulator/SkinDefinitionTest.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'emulator') 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() val dir = getRootSkinFolder() -- cgit v1.2.3