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

Commit 17dcc015 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 2a1e6a69: am 18048411: am f6b6462f: am 14adfe42: Address comments from... 

am 2a1e6a69: am 18048411: am f6b6462f: am 14adfe42: Address comments from merged "Fix remaining jank in sec..."

* commit '2a1e6a69':
  Address comments from merged "Fix remaining jank in sec..."
parents 4dd1cec4 2a1e6a69

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import android.provider.MediaStore; 
import android.util.Log;

import android.view.WindowManager;



import com.android.internal.policy.impl.keyguard.KeyguardSecurityCallback.OnDismissAction;

import com.android.internal.policy.impl.keyguard.KeyguardHostView.OnDismissAction;

import com.android.internal.widget.LockPatternUtils;



import java.util.List;

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

+5 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import android.view.animation.AnimationUtils; 
import android.widget.RemoteViews.OnClickHandler;



import com.android.internal.R;

import com.android.internal.policy.impl.keyguard.KeyguardSecurityCallback.OnDismissAction;

import com.android.internal.policy.impl.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.internal.widget.LockPatternUtils;
@@ -115,6 +114,11 @@ public class KeyguardHostView extends KeyguardViewBase { 
        void userActivity();

    }



    /*package*/ interface OnDismissAction {

        /* returns true if the dismiss should be deferred */

        boolean onDismiss();

    }



    public KeyguardHostView(Context context) {

        this(context, null);

    }

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

+2 −6
Original line number Diff line number Diff line
@@ -15,13 +15,9 @@ 
 */

package com.android.internal.policy.impl.keyguard;



public interface KeyguardSecurityCallback {



    /*package*/ interface OnDismissAction {

import com.android.internal.policy.impl.keyguard.KeyguardHostView.OnDismissAction;



        /* returns true if the dismiss should be deferred */

        boolean onDismiss();

    }

public interface KeyguardSecurityCallback {



    /**

     * Dismiss the given security screen.

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

+4 −0
Original line number Diff line number Diff line
@@ -567,6 +567,8 @@ public class KeyguardViewMediator { 
            mScreenOn = false;

            if (DEBUG) Log.d(TAG, "onScreenTurnedOff(" + why + ")");



            mKeyguardDonePending = false;



            // Lock immediately based on setting if secure (user has a pin/pattern/password).

            // This also "locks" the device when not secure to provide easy access to the

            // camera while preventing unwanted input.
@@ -1226,6 +1228,7 @@ public class KeyguardViewMediator { 


            mKeyguardViewManager.show(options);

            mShowing = true;

            mKeyguardDonePending = false;

            updateActivityLockScreenState();

            adjustStatusBarLocked();

            userActivity();
@@ -1261,6 +1264,7 @@ public class KeyguardViewMediator { 


            mKeyguardViewManager.hide();

            mShowing = false;

            mKeyguardDonePending = false;

            updateActivityLockScreenState();

            adjustStatusBarLocked();

        }