Merge "Fixed a flickering when expanding and the notifications updates" into nyc-dev

2016-05-04 23:30:14 +00:00
parent 11619f4782 e85788710a
commit 4ad13b3340
1 changed files with 3 additions and 3 deletions
--- 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() {