Projects >> frameworks_base_disabled >>7e7248f2df342cf902d1110e4b90892bc23f8bfd

Chunk
Conflicting content 
                break;
            case EMAIL:
                // inputType needs to be overwritten because of the different text variation.
<<<<<<< HEAD
                inputType = InputType.TYPE_CLASS_TEXT
                        | InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS;
=======
                inputType = EditorInfo.TYPE_CLASS_TEXT
                        | EditorInfo.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS;
>>>>>>> 6d1b8995a6e10a3107fd585fc4bae8b2dde24196
                imeOptions |= EditorInfo.IME_ACTION_GO;
                break;
            case NUMBER:
Solution content 
                break;
            case EMAIL:
                // inputType needs to be overwritten because of the different text variation.
                inputType = InputType.TYPE_CLASS_TEXT
                        | InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS;
                imeOptions |= EditorInfo.IME_ACTION_GO;
                break;
            case NUMBER:
File
WebTextView.java
Developer's decision
Version 1
Kind of conflict
Variable
Chunk
Conflicting content 
                break;
            case NUMBER:
                // inputType needs to be overwritten because of the different class.
<<<<<<< HEAD
                inputType = InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_NORMAL;
=======
                inputType = EditorInfo.TYPE_CLASS_NUMBER | EditorInfo.TYPE_NUMBER_VARIATION_NORMAL;
>>>>>>> 6d1b8995a6e10a3107fd585fc4bae8b2dde24196
                // Number and telephone do not have both a Tab key and an
                // action, so set the action to NEXT
                imeOptions |= EditorInfo.IME_ACTION_NEXT;
Solution content 
                break;
            case NUMBER:
                // inputType needs to be overwritten because of the different class.
                inputType = InputType.TYPE_CLASS_NUMBER | InputType.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;
File
WebTextView.java
Developer's decision
Version 1
Kind of conflict
Variable
Chunk
Conflicting content 
                break;
            case TELEPHONE:
                // inputType needs to be overwritten because of the different class.
<<<<<<< HEAD
                inputType = InputType.TYPE_CLASS_PHONE;
=======
                inputType = EditorInfo.TYPE_CLASS_PHONE;
>>>>>>> 6d1b8995a6e10a3107fd585fc4bae8b2dde24196
                imeOptions |= EditorInfo.IME_ACTION_NEXT;
                break;
            case URL:
Solution content 
                break;
            case TELEPHONE:
                // inputType needs to be overwritten because of the different class.
                inputType = InputType.TYPE_CLASS_PHONE;
                imeOptions |= EditorInfo.IME_ACTION_NEXT;
                break;
            case URL:
File
WebTextView.java
Developer's decision
Version 1
Kind of conflict
Variable