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

Commit 30c41997 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Do not hide keyguard message when fp" into pi-dev am: 2d2d79b9 

am: 24ef8f99

Change-Id: I86ae14bd8fd0f6c47dacca95163b38e6f741e18c
parents 196e8024 24ef8f99

packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java

+6 −1
Original line number Diff line number Diff line
@@ -246,7 +246,12 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout 


    @Override

    public boolean onKeyDown(int keyCode, KeyEvent event) {

        // Fingerprint sensor sends a KeyEvent.KEYCODE_UNKNOWN.

        // We don't want to consider it valid user input because the UI

        // will already respond to the event.

        if (keyCode != KeyEvent.KEYCODE_UNKNOWN) {

            onUserInput();

        }

        return false;

    }

packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java

+1 −2
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ import com.android.internal.annotations.VisibleForTesting; 
public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView

        implements View.OnKeyListener, View.OnTouchListener {



    @VisibleForTesting

    PasswordTextView mPasswordEntry;

    protected PasswordTextView mPasswordEntry;

    private View mOkButton;

    private View mDeleteButton;

    private View mButton0;

packages/SystemUI/tests/src/com/android/keyguard/KeyguardPinBasedInputViewTest.java

+23 −4
Original line number Diff line number Diff line
@@ -16,11 +16,15 @@ 


package com.android.keyguard;



import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyZeroInteractions;



import android.support.test.filters.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper.RunWithLooper;

import android.view.KeyEvent;

import android.view.LayoutInflater;



import com.android.systemui.SysuiTestCase;
@@ -28,6 +32,7 @@ import com.android.systemui.SysuiTestCase; 
import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.InjectMocks;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;
@@ -37,21 +42,35 @@ import org.mockito.MockitoAnnotations; 
public class KeyguardPinBasedInputViewTest extends SysuiTestCase {



    @Mock

    private PasswordTextView mPasswordTextView;

    private PasswordTextView mPasswordEntry;

    @Mock

    private SecurityMessageDisplay mSecurityMessageDisplay;

    @InjectMocks

    private KeyguardPinBasedInputView mKeyguardPinView;



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        LayoutInflater inflater = LayoutInflater.from(getContext());

        mKeyguardPinView =

                (KeyguardPinBasedInputView) inflater.inflate(R.layout.keyguard_pin_view, null);

        mKeyguardPinView.mPasswordEntry = mPasswordTextView;

        MockitoAnnotations.initMocks(this);

    }



    @Test

    public void onResume_requestsFocus() {

        mKeyguardPinView.onResume(KeyguardSecurityView.SCREEN_ON);

        verify(mPasswordTextView).requestFocus();

        verify(mPasswordEntry).requestFocus();

    }



    @Test

    public void onKeyDown_clearsSecurityMessage() {

        mKeyguardPinView.onKeyDown(KeyEvent.KEYCODE_0, mock(KeyEvent.class));

        verify(mSecurityMessageDisplay).setMessage(eq(""));

    }



    @Test

    public void onKeyDown_noSecurityMessageInteraction() {

        mKeyguardPinView.onKeyDown(KeyEvent.KEYCODE_UNKNOWN, mock(KeyEvent.class));

        verifyZeroInteractions(mSecurityMessageDisplay);

    }

}