Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '8ede62745faa02265f927941d1195b6c1bf05ebb':
  Fix input type judgment of WebTextView (DO NOT MERGE)
This commit is contained in:
Tadashi G. Takaoka
2011-05-31 00:18:54 -07:00
committed by Android Git Automerger
parent 93b05690ff 8ede62745f
commit 69a4877638
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/webkit/WebTextView.java
View File

@@ -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: