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

Avoid weird expand animation when a notification is updated

Browse Source 
am: bb42b7dd48

Change-Id: I68f50687c08ff6f9100d4bfcc2ac35ec52b98e09
This commit is contained in:
Selim Cinek
2016-08-23 19:09:28 +00:00
committed by android-build-merger
parent 79665f9679 bb42b7dd48
commit b438c11564
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();
mIsPinned = pinned;
if (intrinsicHeight != getIntrinsicHeight()) {
notifyHeightChanged(false);
notifyHeightChanged(false /* needsAnimation */);
}
if (pinned) {
setIconAnimationRunning(true);
@@ -840,8 +840,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
}
public void resetHeight() {
mMaxExpandHeight = 0;
mHeadsUpHeight = 0;
onHeightReset();
requestLayout();
}
@@ -1290,7 +1288,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
}
mHeadsUpHeight = headsUpChild.getHeight();
if (intrinsicBefore != getIntrinsicHeight()) {
notifyHeightChanged(false /* needsAnimation */);
notifyHeightChanged(true /* needsAnimation */);
}
}
@@ -1398,7 +1396,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
if (isChildInGroup()) {
mGroupManager.setGroupExpanded(mStatusBarNotification, true);
}
notifyHeightChanged(false);
notifyHeightChanged(false /* needsAnimation */);
}
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 boolean mDontReportNextOverScroll;
private boolean mDontClampNextScroll;
private boolean mRequestViewResizeAnimationOnLayout;
private boolean mNeedViewResizeAnimation;
private View mExpandedGroupView;
private boolean mEverythingNeedsAnimation;
@@ -518,10 +517,6 @@ public class NotificationStackScrollLayout extends ViewGroup
setMaxLayoutHeight(getHeight());
updateContentHeight();
clampScrollPosition();
if (mRequestViewResizeAnimationOnLayout) {
requestAnimationOnViewResize(null);
mRequestViewResizeAnimationOnLayout = false;
}
requestChildrenUpdate();
updateFirstAndLastBackgroundViews();
}
@@ -3104,9 +3099,6 @@ public class NotificationStackScrollLayout extends ViewGroup
@Override
public void onReset(ExpandableView view) {
if (mIsExpanded && mAnimationsEnabled) {
mRequestViewResizeAnimationOnLayout = true;
}
updateAnimationState(view);
updateChronometerForChild(view);
}