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

Merge "Fixed an icon flickering when adding a notification" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-29 16:45:50 +00:00
committed by Android (Google) Code Review
parent 7c726fb430 f38d6c3b15
commit aa481d695d
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
View File

@@ -943,6 +943,10 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
} }
} }
public boolean isDrawingAppearAnimation() {
return mDrawingAppearAnimation;
}
@Override @Override
protected void dispatchDraw(Canvas canvas) { protected void dispatchDraw(Canvas canvas) {
if (mDrawingAppearAnimation) { if (mDrawingAppearAnimation) {

5
packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
View File

@@ -505,6 +505,11 @@ public class NotificationShelf extends ActivatableNotificationView implements
iconState.scaleX = newSize / icon.getHeight() / icon.getIconScale(); iconState.scaleX = newSize / icon.getHeight() / icon.getIconScale();
iconState.scaleY = iconState.scaleX; iconState.scaleY = iconState.scaleX;
iconState.hidden = transitionAmount == 0.0f && !iconState.isAnimating(icon); iconState.hidden = transitionAmount == 0.0f && !iconState.isAnimating(icon);
boolean isAppearing = row.isDrawingAppearAnimation() && !row.isInShelf();
if (isAppearing) {
iconState.hidden = true;
iconState.iconAppearAmount = 0.0f;
}
iconState.alpha = alpha; iconState.alpha = alpha;
iconState.yTranslation = iconYTranslation; iconState.yTranslation = iconYTranslation;
if (stayingInShelf) { if (stayingInShelf) {