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

This commit is contained in:
TreeHugger Robot
2016-05-04 23:30:14 +00:00
committed by Android (Google) Code Review

View File

@@ -392,6 +392,9 @@ public class NotificationContentView extends FrameLayout {
mVisibleType = visibleType; mVisibleType = visibleType;
updateBackgroundColor(true /* animate */); updateBackgroundColor(true /* animate */);
} }
if (mForceSelectNextLayout) {
forceUpdateVisibilities();
}
if (mTransformationStartVisibleType != UNDEFINED if (mTransformationStartVisibleType != UNDEFINED
&& mVisibleType != mTransformationStartVisibleType && mVisibleType != mTransformationStartVisibleType
&& getViewForVisibleType(mTransformationStartVisibleType) != null) { && getViewForVisibleType(mTransformationStartVisibleType) != null) {
@@ -508,9 +511,6 @@ public class NotificationContentView extends FrameLayout {
updateBackgroundColor(animate); updateBackgroundColor(animate);
} }
} }
if (mForceSelectNextLayout) {
forceUpdateVisibilities();
}
} }
private void forceUpdateVisibilities() { private void forceUpdateVisibilities() {