3 files changed, 63 insertions, 2 deletions
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index c6ab8a28ed4c..d8715dbf7646 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -671,6 +671,7 @@ cc_test {
         "tests/unit/SkiaPipelineTests.cpp",
         "tests/unit/SkiaRenderPropertiesTests.cpp",
         "tests/unit/SkiaCanvasTests.cpp",
+        "tests/unit/StretchEffectTests.cpp",
         "tests/unit/StringUtilsTests.cpp",
         "tests/unit/TestUtilsTests.cpp",
         "tests/unit/ThreadBaseTests.cpp",
diff --git a/libs/hwui/effects/StretchEffect.h b/libs/hwui/effects/StretchEffect.h
index a92ef5bfe658..64fb2bf7ef18 100644
--- a/libs/hwui/effects/StretchEffect.h
+++ b/libs/hwui/effects/StretchEffect.h
@@ -110,8 +110,7 @@ public:
     }
 
     bool requiresLayer() const {
-        return !(isEmpty() ||
-                 Properties::getStretchEffectBehavior() == StretchEffectBehavior::UniformScale);
+        return !isEmpty();
     }
 
 private:
diff --git a/libs/hwui/tests/unit/StretchEffectTests.cpp b/libs/hwui/tests/unit/StretchEffectTests.cpp
new file mode 100644
index 000000000000..f5e20a1d11c6
--- /dev/null
+++ b/libs/hwui/tests/unit/StretchEffectTests.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+#include <effects/StretchEffect.h>
+#include "tests/common/TestUtils.h"
+#include "Properties.h"
+
+using namespace android;
+using namespace android::uirenderer;
+
+TEST(StretchEffect, noStretchDirectionDoesNotRequireLayer) {
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::ShaderHWUI);
+  auto stretchEffect = StretchEffect({.fX = 0.f, .fY = 0.f}, 100.f, 100.f);
+  ASSERT_FALSE(stretchEffect.requiresLayer());
+
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::UniformScale);
+  ASSERT_FALSE(stretchEffect.requiresLayer());
+}
+
+TEST(StretchEffect, horizontalStretchRequiresLayer) {
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::ShaderHWUI);
+  auto stretchEffect = StretchEffect({.fX = 1.f, .fY = 0.f}, 100.f, 100.f);
+  ASSERT_TRUE(stretchEffect.requiresLayer());
+
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::UniformScale);
+  ASSERT_TRUE(stretchEffect.requiresLayer());
+}
+
+TEST(StretchEffect, verticalStretchRequiresLayer) {
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::ShaderHWUI);
+
+  auto stretchEffect = StretchEffect({.fX = 0.f, .fY = 1.f}, 100.f, 100.f);
+  ASSERT_TRUE(stretchEffect.requiresLayer());
+
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::UniformScale);
+  ASSERT_TRUE(stretchEffect.requiresLayer());
+}
+
+TEST(StretchEffect, bidirectionalStretchRequiresLayer) {
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::ShaderHWUI);
+
+  auto stretchEffect = StretchEffect({.fX = 1.f, .fY = 1.f}, 100.f, 100.f);
+  ASSERT_TRUE(stretchEffect.requiresLayer());
+
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::UniformScale);
+  ASSERT_TRUE(stretchEffect.requiresLayer());
+}
+\ No newline at end of file