Skip to content

Commit 6e36f10

Browse files
author
John Spurlock
committed
Fix launcher flash during secure camera transition.
Bug:7452928 Change-Id: I8b7d9bdb14addefb9e9ed71a45d438418b3e21dd
1 parent 080471e commit 6e36f10

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ public void launchCamera() {
118118
public void launchActivity(final Intent intent, boolean showsWhileLocked, boolean animate) {
119119
final Context context = getContext();
120120
final Bundle animation = animate ? null :
121-
ActivityOptions.makeCustomAnimation(context, com.android.internal.R.anim.fade_in,
122-
com.android.internal.R.anim.fade_out).toBundle();
121+
ActivityOptions.makeCustomAnimation(context, 0, 0).toBundle();
123122
LockPatternUtils lockPatternUtils = getLockPatternUtils();
124123
intent.addFlags(
125124
Intent.FLAG_ACTIVITY_NEW_TASK

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ private void addWidget(int appId, int pageIndex) {
824824
public void onLaunchingCamera() {
825825
SlidingChallengeLayout slider = locateSlider();
826826
if (slider != null) {
827-
slider.showHandle(false);
827+
slider.setHandleAlpha(0);
828828
}
829829
}
830830

@@ -835,7 +835,7 @@ public void onCameraLaunched() {
835835
}
836836
SlidingChallengeLayout slider = locateSlider();
837837
if (slider != null) {
838-
slider.showHandle(true);
838+
slider.setHandleAlpha(1);
839839
slider.showChallenge(true);
840840
}
841841
}

policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -270,16 +270,9 @@ public SlidingChallengeLayout(Context context, AttributeSet attrs, int defStyle)
270270
setWillNotDraw(false);
271271
}
272272

273-
public void showHandle(boolean visible) {
274-
if (visible) {
275-
if (mHandleAnimation != null) {
276-
mHandleAnimation.cancel();
277-
mHandleAnimation = null;
278-
}
279-
mHandleAlpha = 1.f;
280-
invalidate();
281-
} else {
282-
animateHandle(false);
273+
public void setHandleAlpha(float alpha) {
274+
if (mExpandChallengeView != null) {
275+
mExpandChallengeView.setAlpha(alpha);
283276
}
284277
}
285278

0 commit comments

Comments
 (0)