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

Commit 80daae50 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Revert "Ensure keyboard is hidden when bouncer is..."" into tm-qpr-dev... 

Merge "Revert "Ensure keyboard is hidden when bouncer is..."" into tm-qpr-dev am: 1dc4031b am: dfd2e8c9 am: 41d46ab2 am: bbb6d07f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22314408



Change-Id: I0846d883ef78cbad1cf53fdf9f62200a69bb5dfd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 72c93c3e bbb6d07f

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

+0 −10
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ import android.text.method.TextKeyListener; 
import android.view.KeyEvent;

import android.view.KeyEvent;

import android.view.View;

import android.view.View;

import android.view.ViewGroup.MarginLayoutParams;

import android.view.ViewGroup.MarginLayoutParams;

import android.view.WindowInsets;

import android.view.inputmethod.EditorInfo;

import android.view.inputmethod.EditorInfo;

import android.view.inputmethod.InputMethodInfo;

import android.view.inputmethod.InputMethodInfo;

import android.view.inputmethod.InputMethodManager;

import android.view.inputmethod.InputMethodManager;
@@ -157,15 +156,6 @@ public class KeyguardPasswordViewController 
        // TODO: Remove this workaround by ensuring such a race condition never happens.

        // TODO: Remove this workaround by ensuring such a race condition never happens.

        mMainExecutor.executeDelayed(

        mMainExecutor.executeDelayed(

                this::updateSwitchImeButton, DELAY_MILLIS_TO_REEVALUATE_IME_SWITCH_ICON);

                this::updateSwitchImeButton, DELAY_MILLIS_TO_REEVALUATE_IME_SWITCH_ICON);

        mView.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() {

            @Override

            public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {

                if (!mKeyguardViewController.isBouncerShowing()) {

                    mView.hideKeyboard();

                }

                return insets;

            }

        });

    }

    }





    @Override

    @Override

packages/SystemUI/tests/src/com/android/keyguard/KeyguardPasswordViewControllerTest.kt

+1 −19
Original line number Original line Diff line number Diff line
@@ -18,10 +18,8 @@ package com.android.keyguard 




import android.testing.AndroidTestingRunner

import android.testing.AndroidTestingRunner

import android.testing.TestableLooper

import android.testing.TestableLooper

import android.view.View

import android.view.inputmethod.InputMethodManager

import android.view.inputmethod.InputMethodManager

import android.widget.EditText

import android.widget.EditText

import android.widget.ImageView

import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import com.android.internal.util.LatencyTracker

import com.android.internal.util.LatencyTracker

import com.android.internal.widget.LockPatternUtils

import com.android.internal.widget.LockPatternUtils
@@ -32,7 +30,6 @@ import com.android.systemui.util.concurrency.DelayableExecutor 
import org.junit.Before

import org.junit.Before

import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith

import org.mockito.ArgumentCaptor

import org.mockito.ArgumentMatchers.anyBoolean

import org.mockito.ArgumentMatchers.anyBoolean

import org.mockito.ArgumentMatchers.anyString

import org.mockito.ArgumentMatchers.anyString

import org.mockito.Mock

import org.mockito.Mock
@@ -40,7 +37,6 @@ import org.mockito.Mockito 
import org.mockito.Mockito.never

import org.mockito.Mockito.never

import org.mockito.Mockito.verify

import org.mockito.Mockito.verify

import org.mockito.Mockito.`when`

import org.mockito.Mockito.`when`

import org.mockito.Mockito.mock

import org.mockito.MockitoAnnotations

import org.mockito.MockitoAnnotations





@SmallTest

@SmallTest
@@ -80,8 +76,6 @@ class KeyguardPasswordViewControllerTest : SysuiTestCase() { 
    Mockito.`when`(keyguardPasswordView.findViewById<EditText>(R.id.passwordEntry))

    Mockito.`when`(keyguardPasswordView.findViewById<EditText>(R.id.passwordEntry))

        .thenReturn(passwordEntry)

        .thenReturn(passwordEntry)

    `when`(keyguardPasswordView.resources).thenReturn(context.resources)

    `when`(keyguardPasswordView.resources).thenReturn(context.resources)

    `when`(keyguardPasswordView.findViewById<ImageView>(R.id.switch_ime_button))

        .thenReturn(mock(ImageView::class.java))

    keyguardPasswordViewController =

    keyguardPasswordViewController =

        KeyguardPasswordViewController(

        KeyguardPasswordViewController(

            keyguardPasswordView,

            keyguardPasswordView,
@@ -118,18 +112,6 @@ class KeyguardPasswordViewControllerTest : SysuiTestCase() { 
    verify(keyguardPasswordView, never()).requestFocus()

    verify(keyguardPasswordView, never()).requestFocus()

  }

  }





  @Test

  fun onApplyWindowInsetsListener_onApplyWindowInsets() {

      `when`(keyguardViewController.isBouncerShowing).thenReturn(false)

      val argumentCaptor = ArgumentCaptor.forClass(View.OnApplyWindowInsetsListener::class.java)



      keyguardPasswordViewController.onViewAttached()

      verify(keyguardPasswordView).setOnApplyWindowInsetsListener(argumentCaptor.capture())

      argumentCaptor.value.onApplyWindowInsets(keyguardPasswordView, null)



      verify(keyguardPasswordView).hideKeyboard()

  }



  @Test

  @Test

  fun testHideKeyboardWhenOnPause() {

  fun testHideKeyboardWhenOnPause() {

    keyguardPasswordViewController.onPause()

    keyguardPasswordViewController.onPause()