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

Merge "Fixed crash when tapping a notification" into lmp-dev

Browse Source
This commit is contained in:
Selim Cinek
2014-08-25 18:49:35 +00:00
committed by Android (Google) Code Review
parent 962821524c 6aaf217076
commit 00c2ff3df9
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,9 +243,14 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
int widthHalf = mBackgroundNormal.getWidth()/2;
int heightHalf = mBackgroundNormal.getActualHeight()/2;
float radius = (float) Math.sqrt(widthHalf*widthHalf + heightHalf*heightHalf);
Animator animator =
ViewAnimationUtils.createCircularReveal(mBackgroundNormal,
widthHalf, heightHalf, 0, radius);
Animator animator;
if (reverse) {
animator = ViewAnimationUtils.createCircularReveal(mBackgroundNormal,
widthHalf, heightHalf, radius, 0);
} else {
animator = ViewAnimationUtils.createCircularReveal(mBackgroundNormal,
widthHalf, heightHalf, 0, radius);
}
mBackgroundNormal.setVisibility(View.VISIBLE);
Interpolator interpolator;
Interpolator alphaInterpolator;
@@ -268,7 +273,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
}
}
});
animator.reverse();
animator.start();
} else {
mBackgroundNormal.setAlpha(0.4f);
animator.start();