Merge "Temporarily disable fading edges if solidColor=0 and hw is on."
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 7355353..4c8b54a 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7738,7 +7738,8 @@
         saveCount = canvas.getSaveCount();
 
         int solidColor = getSolidColor();
-        if (solidColor == 0) {
+        // TODO: Temporarily disable fading edges with hardware acceleration
+        if (solidColor == 0 && !canvas.isHardwareAccelerated()) {
             final int flags = Canvas.HAS_ALPHA_LAYER_SAVE_FLAG;
 
             if (drawTop) {