Enable numeric password for Chrome and WebView

Currently <input type='password' inputmode='numeric'> shows normal
password type virtual keyboard. With this change, it will show
numeric password type keyboard.

Bug: 1068182
Change-Id: I04f85ff240678b3f8854a84ad9227e1437b3300d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2139355
Commit-Queue: Changwan Ryu <changwan@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Navid Zolghadr <nzolghadr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757537}

content/public/android/java/src/org/chromium/content/browser/input/ImeUtils.java

@@ -75,7 +75,6 @@ public class ImeUtils {
             } else if (inputType == TextInputType.NUMBER) {
                 // Number
                 outAttrs.inputType = InputType.TYPE_CLASS_NUMBER
-                        | InputType.TYPE_NUMBER_VARIATION_NORMAL
                         | InputType.TYPE_NUMBER_FLAG_DECIMAL;
             }
         } else {
@@ -101,8 +100,10 @@ public class ImeUtils {
                             | InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS;
                     break;
                 case WebTextInputMode.NUMERIC:
-                    outAttrs.inputType =
-                            InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_NORMAL;
+                    outAttrs.inputType = InputType.TYPE_CLASS_NUMBER;
+                    if (inputType == TextInputType.PASSWORD) {
+                        outAttrs.inputType |= InputType.TYPE_NUMBER_VARIATION_PASSWORD;
+                    }
                     break;
                 case WebTextInputMode.DECIMAL:
                     outAttrs.inputType =
@@ -126,7 +127,8 @@ public class ImeUtils {
             outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
         }
 
-        if ((inputFlags & WebTextInputFlags.HAS_BEEN_PASSWORD_FIELD) != 0) {
+        if ((inputFlags & WebTextInputFlags.HAS_BEEN_PASSWORD_FIELD) != 0
+                && (outAttrs.inputType & InputType.TYPE_NUMBER_VARIATION_PASSWORD) == 0) {
             outAttrs.inputType =
                     InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD;
         }

content/public/android/javatests/src/org/chromium/content/browser/input/ImeInputModeTest.java

@@ -5,6 +5,7 @@
 package org.chromium.content.browser.input;
 
 import android.support.test.filters.SmallTest;
+import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
 
 import org.junit.Assert;
@@ -31,6 +32,22 @@ public class ImeInputModeTest {
         mRule.setUpForUrl(ImeActivityTestRule.INPUT_MODE_HTML);
     }
 
+    @Test
+    @SmallTest
+    @Feature({"TextInput"})
+    public void testNumericPassword() throws Exception {
+        mRule.focusElement("input_numeric_password", true /* shouldShowKeyboard */);
+
+        mRule.waitForKeyboardStates(1, 0, 1, new Integer[] {TextInputType.PASSWORD},
+                new Integer[] {WebTextInputMode.NUMERIC});
+        Assert.assertNotNull(mRule.getInputMethodManagerWrapper().getInputConnection());
+
+        Assert.assertTrue(
+                (mRule.getConnectionFactory().getOutAttrs().inputType
+                        & (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD))
+                != 0);
+    }
+
     @Test
     @SmallTest
     @Feature({"TextInput"})

content/test/data/android/input/input_mode.html

@@ -19,6 +19,8 @@
     <div id="contenteditable_numeric" contenteditable inputMode="numeric"></div>
     <div id="contenteditable_decimal" contenteditable inputMode="decimal"></div>
     <div id="contenteditable_search" contenteditable inputMode="search"></div>
+
+    <input type="password" inputMode="numeric" id="input_numeric_password" />
   </body>
 
     <script>

third_party/blink/renderer/core/html/forms/password_input_type.cc

@@ -200,4 +200,9 @@ void PasswordInputType::HandleKeydownEvent(KeyboardEvent& event) {
   if (!event.DefaultHandled())
     BaseTextInputType::HandleKeydownEvent(event);
 }
+
+bool PasswordInputType::SupportsInputModeAttribute() const {
+  return true;
+}
+
 }  // namespace blink

third_party/blink/renderer/core/html/forms/password_input_type.h

@@ -62,6 +62,7 @@ class PasswordInputType final : public BaseTextInputType {
   void HandleBeforeTextInsertedEvent(BeforeTextInsertedEvent&) override;
 
   void HandleBlurEvent() override;
+  bool SupportsInputModeAttribute() const override;
 
   bool should_show_reveal_button_ = false;
 };