Revert "Ensure keyboard is hidden when bouncer is..."
This reverts commit 8d0f687b31.
Fixes: 273816675
Fixes: 273899271
Fixes: 274006564
Fixes: 263785115
Reason for revert: keyboard cannot be used in other parts of the notification shade when bouncer is hidden
Change-Id: I34d02169b342f7571cf7bf6e1caa3be5e8b7d1a7
This commit is contained in:
@@ -26,7 +26,6 @@ import android.text.method.TextKeyListener;
|
||||
import android.view.KeyEvent;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup.MarginLayoutParams;
|
||||
import android.view.WindowInsets;
|
||||
import android.view.inputmethod.EditorInfo;
|
||||
import android.view.inputmethod.InputMethodInfo;
|
||||
import android.view.inputmethod.InputMethodManager;
|
||||
@@ -157,15 +156,6 @@ public class KeyguardPasswordViewController
|
||||
// TODO: Remove this workaround by ensuring such a race condition never happens.
|
||||
mMainExecutor.executeDelayed(
|
||||
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
|
||||
|
||||
@@ -18,10 +18,8 @@ package com.android.keyguard
|
||||
|
||||
import android.testing.AndroidTestingRunner
|
||||
import android.testing.TestableLooper
|
||||
import android.view.View
|
||||
import android.view.inputmethod.InputMethodManager
|
||||
import android.widget.EditText
|
||||
import android.widget.ImageView
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.internal.util.LatencyTracker
|
||||
import com.android.internal.widget.LockPatternUtils
|
||||
@@ -32,7 +30,6 @@ import com.android.systemui.util.concurrency.DelayableExecutor
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.mockito.ArgumentCaptor
|
||||
import org.mockito.ArgumentMatchers.anyBoolean
|
||||
import org.mockito.ArgumentMatchers.anyString
|
||||
import org.mockito.Mock
|
||||
@@ -40,7 +37,6 @@ import org.mockito.Mockito
|
||||
import org.mockito.Mockito.never
|
||||
import org.mockito.Mockito.verify
|
||||
import org.mockito.Mockito.`when`
|
||||
import org.mockito.Mockito.mock
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@SmallTest
|
||||
@@ -80,9 +76,7 @@ class KeyguardPasswordViewControllerTest : SysuiTestCase() {
|
||||
Mockito.`when`(keyguardPasswordView.findViewById<EditText>(R.id.passwordEntry))
|
||||
.thenReturn(passwordEntry)
|
||||
`when`(keyguardPasswordView.resources).thenReturn(context.resources)
|
||||
`when`(keyguardPasswordView.findViewById<ImageView>(R.id.switch_ime_button))
|
||||
.thenReturn(mock(ImageView::class.java))
|
||||
keyguardPasswordViewController =
|
||||
keyguardPasswordViewController =
|
||||
KeyguardPasswordViewController(
|
||||
keyguardPasswordView,
|
||||
keyguardUpdateMonitor,
|
||||
@@ -118,18 +112,6 @@ class KeyguardPasswordViewControllerTest : SysuiTestCase() {
|
||||
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
|
||||
fun testHideKeyboardWhenOnPause() {
|
||||
keyguardPasswordViewController.onPause()
|
||||
|
||||
Reference in New Issue
Block a user