commit a554c707386eb8a6c6fb3a2399f23b79a1c17f74
author Selim Cinek <cinek@google.com> Fri Jun 17 18:02:12 2016 -0700
committer Selim Cinek <cinek@google.com> Fri Jun 17 18:02:12 2016 -0700
tree 01c868654d33ef93a72fad03816eddebd9fde341
parent 73cf02a0783e3857cae21fece9c292abcc9e1409

Fixed a potential issue where a notification could be empty

Change-Id: Ic4b294092a47d30c469dfbd1eb6ab31208533b1c
Fixes: 29158425

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index 39fce7b..2088140 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -1307,6 +1307,10 @@
         if (!animated) {
             mPublicLayout.animate().cancel();
             mPrivateLayout.animate().cancel();
+            if (mChildrenContainer != null) {
+                mChildrenContainer.animate().cancel();
+                mChildrenContainer.setAlpha(1f);
+            }
             mPublicLayout.setAlpha(1f);
             mPrivateLayout.setAlpha(1f);
             mPublicLayout.setVisibility(mShowingPublic ? View.VISIBLE : View.INVISIBLE);