Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f520143 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 8b26141a: am 670f5a52: am e0dd7c46: am 2cacda5f: Disable interactive mode... 

am 8b26141a: am 670f5a52: am e0dd7c46: am 2cacda5f: Disable interactive mode for full-screen security views in keyguard.

* commit '8b26141a':
  Disable interactive mode for full-screen security views in keyguard.
parents 23d5a1d7 8b26141a

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

+10 −5
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ public class KeyguardHostView extends KeyguardViewBase { 
        }

    };



    private SlidingChallengeLayout mSlidingChallengeLayout;



    @Override

    public boolean onTouchEvent(MotionEvent ev) {

        boolean result = super.onTouchEvent(ev);
@@ -196,15 +198,14 @@ public class KeyguardHostView extends KeyguardViewBase { 
        mAppWidgetContainer.setDeleteDropTarget(deleteDropTarget);

        mAppWidgetContainer.setMinScale(0.5f);



        SlidingChallengeLayout slider =

                (SlidingChallengeLayout) findViewById(R.id.sliding_layout);

        if (slider != null) {

            slider.setOnChallengeScrolledListener(mViewStateManager);

        mSlidingChallengeLayout = (SlidingChallengeLayout) findViewById(R.id.sliding_layout);

        if (mSlidingChallengeLayout != null) {

            mSlidingChallengeLayout.setOnChallengeScrolledListener(mViewStateManager);

        }

        mAppWidgetContainer.setViewStateManager(mViewStateManager);

        mAppWidgetContainer.setLockPatternUtils(mLockPatternUtils);



        ChallengeLayout challenge = slider != null ? slider :

        ChallengeLayout challenge = mSlidingChallengeLayout != null ? mSlidingChallengeLayout :

            (ChallengeLayout) findViewById(R.id.multi_pane_challenge);

        challenge.setOnBouncerStateChangedListener(mViewStateManager);

        mAppWidgetContainer.setBouncerAnimationDuration(challenge.getBouncerAnimationDuration());
@@ -733,6 +734,10 @@ public class KeyguardHostView extends KeyguardViewBase { 
        mAppWidgetContainer.setVisibility(

                isSimOrAccount && fullScreenEnabled ? View.GONE : View.VISIBLE);



        if (mSlidingChallengeLayout != null) {

            mSlidingChallengeLayout.setChallengeInteractive(!fullScreenEnabled);

        }



        // Emulate Activity life cycle

        if (oldView != null) {

            oldView.onPause();