Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid weird expand animation when a notification is updated" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-23 18:53:20 +00:00
committed by Android (Google) Code Review
parent e0736b4fb0 bb42b7dd48
commit c55457b146
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
View File

@@ -507,7 +507,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
int intrinsicHeight = getIntrinsicHeight(); int intrinsicHeight = getIntrinsicHeight();
mIsPinned = pinned; mIsPinned = pinned;
if (intrinsicHeight != getIntrinsicHeight()) { if (intrinsicHeight != getIntrinsicHeight()) {
notifyHeightChanged(false); notifyHeightChanged(false /* needsAnimation */);
} }
if (pinned) { if (pinned) {
setIconAnimationRunning(true); setIconAnimationRunning(true);
@@ -840,8 +840,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
} }
public void resetHeight() { public void resetHeight() {
mMaxExpandHeight = 0;
mHeadsUpHeight = 0;
onHeightReset(); onHeightReset();
requestLayout(); requestLayout();
} }
@@ -1290,7 +1288,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
} }
mHeadsUpHeight = headsUpChild.getHeight(); mHeadsUpHeight = headsUpChild.getHeight();
if (intrinsicBefore != getIntrinsicHeight()) { if (intrinsicBefore != getIntrinsicHeight()) {
notifyHeightChanged(false /* needsAnimation */); notifyHeightChanged(true /* needsAnimation */);
} }
} }
@@ -1398,7 +1396,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
if (isChildInGroup()) { if (isChildInGroup()) {
mGroupManager.setGroupExpanded(mStatusBarNotification, true); mGroupManager.setGroupExpanded(mStatusBarNotification, true);
} }
notifyHeightChanged(false); notifyHeightChanged(false /* needsAnimation */);
} }
public void setChildrenExpanded(boolean expanded, boolean animate) { public void setChildrenExpanded(boolean expanded, boolean animate) {

8
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -216,7 +216,6 @@ public class NotificationStackScrollLayout extends ViewGroup
private float mTopPaddingOverflow; private float mTopPaddingOverflow;
private boolean mDontReportNextOverScroll; private boolean mDontReportNextOverScroll;
private boolean mDontClampNextScroll; private boolean mDontClampNextScroll;
private boolean mRequestViewResizeAnimationOnLayout;
private boolean mNeedViewResizeAnimation; private boolean mNeedViewResizeAnimation;
private View mExpandedGroupView; private View mExpandedGroupView;
private boolean mEverythingNeedsAnimation; private boolean mEverythingNeedsAnimation;
@@ -518,10 +517,6 @@ public class NotificationStackScrollLayout extends ViewGroup
setMaxLayoutHeight(getHeight()); setMaxLayoutHeight(getHeight());
updateContentHeight(); updateContentHeight();
clampScrollPosition(); clampScrollPosition();
if (mRequestViewResizeAnimationOnLayout) {
requestAnimationOnViewResize(null);
mRequestViewResizeAnimationOnLayout = false;
}
requestChildrenUpdate(); requestChildrenUpdate();
updateFirstAndLastBackgroundViews(); updateFirstAndLastBackgroundViews();
} }
@@ -3104,9 +3099,6 @@ public class NotificationStackScrollLayout extends ViewGroup
@Override @Override
public void onReset(ExpandableView view) { public void onReset(ExpandableView view) {
if (mIsExpanded && mAnimationsEnabled) {
mRequestViewResizeAnimationOnLayout = true;
}
updateAnimationState(view); updateAnimationState(view);
updateChronometerForChild(view); updateChronometerForChild(view);
} }