From e85788710a6bff2004ec4d8eb2ddf747a040ee82 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Tue, 3 May 2016 16:42:50 -0700
Subject: [PATCH] Fixed a flickering when expanding and the notifications
 updates

Change-Id: Idda8f5cfc61c3c561963eb3ccfffece9fbf5cde3
Fixes: 28557444
---
 .../android/systemui/statusbar/NotificationContentView.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
index 156889897417c..334d3fa02a078 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
@@ -392,6 +392,9 @@ public class NotificationContentView extends FrameLayout {
             mVisibleType = visibleType;
             updateBackgroundColor(true /* animate */);
         }
+        if (mForceSelectNextLayout) {
+            forceUpdateVisibilities();
+        }
         if (mTransformationStartVisibleType != UNDEFINED
                 && mVisibleType != mTransformationStartVisibleType
                 && getViewForVisibleType(mTransformationStartVisibleType) != null) {
@@ -508,9 +511,6 @@ public class NotificationContentView extends FrameLayout {
                 updateBackgroundColor(animate);
             }
         }
-        if (mForceSelectNextLayout) {
-            forceUpdateVisibilities();
-        }
     }
 
     private void forceUpdateVisibilities() {