Skip to content

Commit 2cacda5

Browse files
Jim Milleradamp
authored andcommitted
Disable interactive mode for full-screen security views in keyguard.
Change-Id: Ied038ba96ba3a6e6f6b4bd25a4c5be74814596fe
1 parent 1e0f6fa commit 2cacda5

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ public void onBootCompleted() {
156156
}
157157
};
158158

159+
private SlidingChallengeLayout mSlidingChallengeLayout;
160+
159161
@Override
160162
public boolean onTouchEvent(MotionEvent ev) {
161163
boolean result = super.onTouchEvent(ev);
@@ -196,15 +198,14 @@ protected void onFinishInflate() {
196198
mAppWidgetContainer.setDeleteDropTarget(deleteDropTarget);
197199
mAppWidgetContainer.setMinScale(0.5f);
198200

199-
SlidingChallengeLayout slider =
200-
(SlidingChallengeLayout) findViewById(R.id.sliding_layout);
201-
if (slider != null) {
202-
slider.setOnChallengeScrolledListener(mViewStateManager);
201+
mSlidingChallengeLayout = (SlidingChallengeLayout) findViewById(R.id.sliding_layout);
202+
if (mSlidingChallengeLayout != null) {
203+
mSlidingChallengeLayout.setOnChallengeScrolledListener(mViewStateManager);
203204
}
204205
mAppWidgetContainer.setViewStateManager(mViewStateManager);
205206
mAppWidgetContainer.setLockPatternUtils(mLockPatternUtils);
206207

207-
ChallengeLayout challenge = slider != null ? slider :
208+
ChallengeLayout challenge = mSlidingChallengeLayout != null ? mSlidingChallengeLayout :
208209
(ChallengeLayout) findViewById(R.id.multi_pane_challenge);
209210
challenge.setOnBouncerStateChangedListener(mViewStateManager);
210211
mAppWidgetContainer.setBouncerAnimationDuration(challenge.getBouncerAnimationDuration());
@@ -733,6 +734,10 @@ private void showSecurityScreen(SecurityMode securityMode) {
733734
mAppWidgetContainer.setVisibility(
734735
isSimOrAccount && fullScreenEnabled ? View.GONE : View.VISIBLE);
735736

737+
if (mSlidingChallengeLayout != null) {
738+
mSlidingChallengeLayout.setChallengeInteractive(!fullScreenEnabled);
739+
}
740+
736741
// Emulate Activity life cycle
737742
if (oldView != null) {
738743
oldView.onPause();

0 commit comments

Comments
 (0)