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

am b2cb86ee: Merge "Fixed a flash of the preview image when going to the dialer" into lmp-dev

Browse Source 
* commit 'b2cb86eef21897285244d2216ca9fbafa70adfd9':
  Fixed a flash of the preview image when going to the dialer
This commit is contained in:
Selim Cinek
2014-08-28 13:48:18 +00:00
committed by Android Git Automerger
parent 9ddc82dff3 1a08a8f52f
commit e2557b4e33
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,6 +163,9 @@ public class KeyguardAffordanceView extends ImageView {
public void setPreviewView(View v) {
mPreviewView = v;
if (mPreviewView != null) {
mPreviewView.setVisibility(INVISIBLE);
}
}
private void drawArrow(Canvas canvas) {
@@ -295,7 +298,7 @@ public class KeyguardAffordanceView extends ImageView {
duration = Math.min(duration, CIRCLE_DISAPPEAR_MAX_DURATION);
animator.setDuration(duration);
animator.start();
if (mPreviewView != null) {
if (mPreviewView != null && mPreviewView.getVisibility() == View.VISIBLE) {
mPreviewView.setVisibility(View.VISIBLE);
mPreviewClipper = ViewAnimationUtils.createCircularReveal(
mPreviewView, getLeft() + mCenterX, getTop() + mCenterY, mCircleRadius,