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

Commit 6a33b50c authored by Danesh Mondegarian's avatar Danesh Mondegarian Committed by Gerrit Code Review
Browse files

Merge "LockscreenTargets : Dismiss on target select" into cm-10.1

parents 068ffb8c 1d73b97e

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

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ public abstract class KeyguardActivityLauncher { 
        }

    }



    private void dismissKeyguardOnNextActivity() {

    protected void dismissKeyguardOnNextActivity() {

        try {

            ActivityManagerNative.getDefault().dismissKeyguardOnNextActivity();

        } catch (RemoteException e) {

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

+5 −0
Original line number Diff line number Diff line
@@ -179,6 +179,11 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri 
            return mLockPatternUtils;

        }



        @Override

        protected void dismissKeyguardOnNextActivity() {

            getCallback().dismiss(false);

        }



        @Override

        Context getContext() {

            return mContext;