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

Commit 69a48776 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am 8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE) 

* commit '8ede6274':
  Fix input type judgment of WebTextView (DO NOT MERGE)
parents 93b05690 8ede6274

core/java/android/webkit/WebTextView.java

+7 −3
Original line number Diff line number Diff line
@@ -1174,17 +1174,21 @@ import junit.framework.Assert; 
                imeOptions |= EditorInfo.IME_ACTION_SEARCH;

                break;

            case EMAIL:

                inputType |= EditorInfo.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS;

                // inputType needs to be overwritten because of the different text variation.

                inputType = EditorInfo.TYPE_CLASS_TEXT

                        | EditorInfo.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS;

                imeOptions |= EditorInfo.IME_ACTION_GO;

                break;

            case NUMBER:

                inputType |= EditorInfo.TYPE_CLASS_NUMBER;

                // inputType needs to be overwritten because of the different class.

                inputType = EditorInfo.TYPE_CLASS_NUMBER | EditorInfo.TYPE_NUMBER_VARIATION_NORMAL;

                // Number and telephone do not have both a Tab key and an

                // action, so set the action to NEXT

                imeOptions |= EditorInfo.IME_ACTION_NEXT;

                break;

            case TELEPHONE:

                inputType |= EditorInfo.TYPE_CLASS_PHONE;

                // inputType needs to be overwritten because of the different class.

                inputType = EditorInfo.TYPE_CLASS_PHONE;

                imeOptions |= EditorInfo.IME_ACTION_NEXT;

                break;

            case URL: