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 
am: aa481d695d

Change-Id: I9b4fb988b6db2cd16a5e78a67ab53948746d6488
This commit is contained in:
Selim Cinek
2017-06-29 16:57:31 +00:00
committed by android-build-merger
parent cc73c3a990 aa481d695d
commit f55beccb2f
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
protected void dispatchDraw(Canvas canvas) {
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.scaleY = iconState.scaleX;
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.yTranslation = iconYTranslation;
if (stayingInShelf) {