From d9c52ba62317aa7919483ccd157182ae0f0db7f4 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Fri, 18 Feb 2011 14:16:29 +0900 Subject: [PATCH] Rename imeOptions attribute of Keyboard to imeAction. Bug: 3384942 Change-Id: I3ce01b83f0ae37f447de8a7fcdb5d7fe06b108c6 --- java/res/values/attrs.xml | 2 +- java/res/xml-xlarge/kbd_qwerty_row4.xml | 2 +- java/res/xml/kbd_key_styles.xml | 10 +++++----- .../android/inputmethod/keyboard/KeyboardId.java | 13 +++++++------ .../inputmethod/keyboard/KeyboardParser.java | 13 +++++++------ 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index b6d5fdc62..dea163595 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -171,7 +171,7 @@ - + diff --git a/java/res/xml-xlarge/kbd_qwerty_row4.xml b/java/res/xml-xlarge/kbd_qwerty_row4.xml index 9d0fd81c7..65ca093a4 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row4.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row4.xml @@ -49,7 +49,7 @@ %s", TAG_CASE, textAttr(KeyboardId.modeName( @@ -444,7 +445,7 @@ public class KeyboardParser { booleanAttr(a, R.styleable.Keyboard_Case_voiceKeyEnabled, "voiceKeyEnabled"), booleanAttr(a, R.styleable.Keyboard_Case_hasVoiceKey, "hasVoiceKey"), textAttr(KeyboardId.imeOptionsName( - a.getInt(R.styleable.Keyboard_Case_imeOptions, -1)), "imeOptions"), + a.getInt(R.styleable.Keyboard_Case_imeAction, -1)), "imeAction"), Boolean.toString(selected))); return selected;