diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/text/method/QwertyKeyListener.java | 6 | ||||
| -rw-r--r-- | core/java/android/view/KeyCharacterMap.java | 12 | ||||
| -rw-r--r-- | core/java/android/view/KeyEvent.java | 19 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 19 |
4 files changed, 27 insertions, 29 deletions
diff --git a/core/java/android/text/method/QwertyKeyListener.java b/core/java/android/text/method/QwertyKeyListener.java index b3926f2..7a1b6aa 100644 --- a/core/java/android/text/method/QwertyKeyListener.java +++ b/core/java/android/text/method/QwertyKeyListener.java @@ -106,6 +106,12 @@ public class QwertyKeyListener extends BaseKeyListener { return true; } + if (i == KeyCharacterMap.DOT_WWW_INPUT || i == KeyCharacterMap.DOT_COM_INPUT) { + content.replace(selStart, selEnd, selStart == 0 ? "www." : ".com"); + adjustMetaAfterKeypress(content); + return true; + } + if (i == KeyCharacterMap.HEX_INPUT) { int start; diff --git a/core/java/android/view/KeyCharacterMap.java b/core/java/android/view/KeyCharacterMap.java index 25958aa..2dec152 100644 --- a/core/java/android/view/KeyCharacterMap.java +++ b/core/java/android/view/KeyCharacterMap.java @@ -55,8 +55,18 @@ public class KeyCharacterMap */ public static final char PICKER_DIALOG_INPUT = '\uEF01'; + /** + * Private use character denoting a .com suffix + */ + public static final char DOT_COM_INPUT = '\uEF03'; + + /** + * Private use character denoting a www. prefix + */ + public static final char DOT_WWW_INPUT = '\uEF04'; + private static Object sLock = new Object(); - private static SparseArray<WeakReference<KeyCharacterMap>> sInstances + private static SparseArray<WeakReference<KeyCharacterMap>> sInstances = new SparseArray<WeakReference<KeyCharacterMap>>(); public static KeyCharacterMap load(int keyboard) diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index b543b2c..05d2492 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -120,20 +120,11 @@ public class KeyEvent implements Parcelable { public static final int KEYCODE_MEDIA_REWIND = 89; public static final int KEYCODE_MEDIA_FAST_FORWARD = 90; public static final int KEYCODE_MUTE = 91; - public static final int KEYCODE_FUNC_1 = 92; - public static final int KEYCODE_FUNC_2 = 93; - public static final int KEYCODE_FUNC_3 = 94; - public static final int KEYCODE_FUNC_4 = 95; - public static final int KEYCODE_FUNC_5 = 96; - public static final int KEYCODE_FUNC_6 = 97; - public static final int KEYCODE_FUNC_7 = 98; - public static final int KEYCODE_FUNC_8 = 99; - public static final int KEYCODE_QUECHAR = 100; - public static final int KEYCODE_USER1 = 101; - public static final int KEYCODE_USER2 = 102; - public static final int KEYCODE_USER3 = 103; - public static final int KEYCODE_USER4 = 104; - public static final int KEYCODE_USER5 = 105; + public static final int KEYCODE_USER1 = 92; + public static final int KEYCODE_USER2 = 93; + public static final int KEYCODE_USER3 = 94; + public static final int KEYCODE_USER4 = 95; + public static final int KEYCODE_USER5 = 96; // NOTE: If you add a new keycode here you must also add it to: // isSystem() diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index e8a1676..a12f21c 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -916,20 +916,11 @@ <enum name="KEYCODE_MEDIA_REWIND" value="89" /> <enum name="KEYCODE_MEDIA_FAST_FORWARD" value="90" /> <enum name="KEYCODE_MUTE" value="91" /> - <enum name="KEYCODE_FUNC_1" value="92" /> - <enum name="KEYCODE_FUNC_2" value="93" /> - <enum name="KEYCODE_FUNC_3" value="94" /> - <enum name="KEYCODE_FUNC_4" value="95" /> - <enum name="KEYCODE_FUNC_5" value="96" /> - <enum name="KEYCODE_FUNC_6" value="97" /> - <enum name="KEYCODE_FUNC_7" value="98" /> - <enum name="KEYCODE_FUNC_8" value="99" /> - <enum name="KEYCODE_QUECHAR" value="100" /> - <enum name="KEYCODE_USER1" value="101" /> - <enum name="KEYCODE_USER2" value="102" /> - <enum name="KEYCODE_USER3" value="103" /> - <enum name="KEYCODE_USER4" value="104" /> - <enum name="KEYCODE_USER5" value="105" /> + <enum name="KEYCODE_USER1" value="92" /> + <enum name="KEYCODE_USER2" value="93" /> + <enum name="KEYCODE_USER3" value="94" /> + <enum name="KEYCODE_USER4" value="95" /> + <enum name="KEYCODE_USER5" value="96" /> </attr> <!-- ***************************************************************** --> |