From 32db609df178bd8991f4ffdba1a7008252120b76 Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Fri, 24 Aug 2018 13:02:54 +0800 Subject: [PATCH] Remove red underline from Device name - Turn off auto-correction for normal text. Bug: 79421621 Test: make RunSettingsRoboTest Change-Id: Ie7c4ebd33073ecaac2048d8630ec7b51e706341c --- .../settings/widget/ValidatedEditTextPreference.java | 3 ++- .../widget/ValidatedEditTextPreferenceTest.java | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/widget/ValidatedEditTextPreference.java b/src/com/android/settings/widget/ValidatedEditTextPreference.java index 76d8bcceb94..3204ab3894a 100644 --- a/src/com/android/settings/widget/ValidatedEditTextPreference.java +++ b/src/com/android/settings/widget/ValidatedEditTextPreference.java @@ -93,7 +93,8 @@ public class ValidatedEditTextPreference extends CustomEditTextPreferenceCompat textView.setInputType( InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); } else { - textView.setInputType(InputType.TYPE_CLASS_TEXT); + textView.setInputType( + InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS); } } diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java index 5b332825e3e..e5cb12d4405 100644 --- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java @@ -131,4 +131,16 @@ public class ValidatedEditTextPreferenceTest { & (InputType.TYPE_TEXT_VARIATION_PASSWORD | InputType.TYPE_CLASS_TEXT)) .isNotEqualTo(0); } + + @Test + public void bindViewHolder_isNotPassword_shouldNotAutoCorrectText() { + final TextView textView = spy(new TextView(RuntimeEnvironment.application)); + when(mViewHolder.findViewById(android.R.id.summary)).thenReturn(textView); + + mPreference.setIsSummaryPassword(false); + mPreference.onBindViewHolder(mViewHolder); + + assertThat(textView.getInputType()).isEqualTo( + InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_CLASS_TEXT); + } }