diff options
3 files changed, 6 insertions, 14 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java index 4c500696cc4d..389939ed2abe 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java @@ -118,8 +118,7 @@ public abstract class KeyguardActivityLauncher { public void launchActivity(final Intent intent, boolean showsWhileLocked, boolean animate) { final Context context = getContext(); final Bundle animation = animate ? null : - ActivityOptions.makeCustomAnimation(context, com.android.internal.R.anim.fade_in, - com.android.internal.R.anim.fade_out).toBundle(); + ActivityOptions.makeCustomAnimation(context, 0, 0).toBundle(); LockPatternUtils lockPatternUtils = getLockPatternUtils(); intent.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java index 045c9aacd5df..b93f9d210b29 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java @@ -824,7 +824,7 @@ public class KeyguardHostView extends KeyguardViewBase { public void onLaunchingCamera() { SlidingChallengeLayout slider = locateSlider(); if (slider != null) { - slider.showHandle(false); + slider.setHandleAlpha(0); } } @@ -835,7 +835,7 @@ public class KeyguardHostView extends KeyguardViewBase { } SlidingChallengeLayout slider = locateSlider(); if (slider != null) { - slider.showHandle(true); + slider.setHandleAlpha(1); slider.showChallenge(true); } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java index a0b11c1a1596..af7dc15eadeb 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java @@ -270,16 +270,9 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout setWillNotDraw(false); } - public void showHandle(boolean visible) { - if (visible) { - if (mHandleAnimation != null) { - mHandleAnimation.cancel(); - mHandleAnimation = null; - } - mHandleAlpha = 1.f; - invalidate(); - } else { - animateHandle(false); + public void setHandleAlpha(float alpha) { + if (mExpandChallengeView != null) { + mExpandChallengeView.setAlpha(alpha); } } |