Merge "Fixed an issue where a notification could flicker" into oc-mr1-dev

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

@@ -380,6 +380,15 @@ public class NotificationShelf extends ActivatableNotificationView implements
         }
     }
 
+    @Override
+    public void setFakeShadowIntensity(float shadowIntensity, float outlineAlpha, int shadowYEnd,
+            int outlineTranslation) {
+        if (!mHasItemsInStableShelf) {
+            shadowIntensity = 0.0f;
+        }
+        super.setFakeShadowIntensity(shadowIntensity, outlineAlpha, shadowYEnd, outlineTranslation);
+    }
+
     /**
      * @return the icon amount how much this notification is in the shelf;
      */