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

Commit bbba68a1 authored by Jim Miller's avatar Jim Miller
Browse files

Route signals from SlidingChalleng to SecurityView 

This maps activity on the SlidingChallenge to the security
challenge view.  Currently it calls onPause() on the SecurityView
if the view is on the move or is hidden.

Change-Id: Ide5f2200e45d8996fa91af06ac2059c3d125ea6f
parent eee20931

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

+28 −2
Original line number Diff line number Diff line
@@ -68,36 +68,62 @@ public class KeyguardSecurityViewFlipper extends ViewFlipper implements Keyguard 


    @Override

    public void setKeyguardCallback(KeyguardSecurityCallback callback) {

        KeyguardSecurityView ksv = getSecurityView();

        if (ksv != null) {

            ksv.setKeyguardCallback(callback);

        }

    }



    @Override

    public void setLockPatternUtils(LockPatternUtils utils) {

        KeyguardSecurityView ksv = getSecurityView();

        if (ksv != null) {

            ksv.setLockPatternUtils(utils);

        }

    }



    @Override

    public void reset() {

        KeyguardSecurityView ksv = getSecurityView();

        if (ksv != null) {

            ksv.reset();

        }

    }



    @Override

    public void onPause() {

        KeyguardSecurityView ksv = getSecurityView();

        if (ksv != null) {

            ksv.onPause();

        }

    }



    @Override

    public void onResume() {

        KeyguardSecurityView ksv = getSecurityView();

        if (ksv != null) {

            ksv.onResume();

        }

    }



    @Override

    public boolean needsInput() {

        return false;

        KeyguardSecurityView ksv = getSecurityView();

        return (ksv != null) ? ksv.needsInput() : false;

    }



    @Override

    public KeyguardSecurityCallback getCallback() {

        return null;

        KeyguardSecurityView ksv = getSecurityView();

        return (ksv != null) ? ksv.getCallback() : null;

    }



    @Override

    public void setSecurityMessageDisplay(SecurityMessageDisplay display) {

        KeyguardSecurityView ksv = getSecurityView();

        if (ksv != null) {

            ksv.setSecurityMessageDisplay(display);

        }

    }



    @Override

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

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.internal.policy.impl.keyguard; 


import android.os.Handler;

import android.os.Looper;

import android.util.Log;

import android.view.View;



public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChallengeScrolledListener {
@@ -134,6 +135,14 @@ public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChalle 
                mPagedView.setOnlyAllowEdgeSwipes(false);

            }



            if (mChallengeLayout.isChallengeShowing()) {

                mKeyguardSecurityContainer.onResume();

            } else {

                mKeyguardSecurityContainer.onPause();

            }

        } else {

            // View is on the move.  Pause the security view until it completes.

            mKeyguardSecurityContainer.onPause();

        }

    }