diff options
Diffstat (limited to 'tests')
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/res/values/donottranslate.xml b/tests/res/values/donottranslate.xml index 3f7634a03..263d0af24 100644 --- a/tests/res/values/donottranslate.xml +++ b/tests/res/values/donottranslate.xml @@ -58,5 +58,5 @@ <string name="upper_indirect_string_with_literal">x,!TEXT/MULTIPLE_CHARS,y</string> <string name="upper_indirect2_string">!TEXT/UPPER_INDIRECT_STRING</string> <string name="upper_infinite_indirection">infinite,!TEXT/INFINITE_INDIRECTION,loop</string> - <string name="indirect_navigate_actions_as_more_key">!fixedColumnOrder!2,!text/action_previous_as_more_key,!text/action_next_as_more_key</string> + <string name="keyspec_indirect_navigate_actions">!fixedColumnOrder!2,!text/keyspec_action_previous,!text/keyspec_action_next</string> </resources> diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java index 7923afc1a..b8cb11b6b 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java @@ -251,14 +251,14 @@ abstract class KeySpecParserTestsBase extends AndroidTestCase { } public void testResourceReference() { - assertParser("Settings as more key", "!text/settings_as_more_key", + assertParser("Settings as more key", "!text/keyspec_settings", null, null, mSettingsIconId, mCodeSettings); assertParser("Action next as more key", "!text/label_next_key|!code/key_action_next", "Next", null, ICON_UNDEFINED, mCodeActionNext); assertParser("Popular domain", - "!text/keylabel_for_popular_domain|!text/keylabel_for_popular_domain ", + "!text/keyspec_popular_domain|!text/keyspec_popular_domain ", ".com", ".com ", ICON_UNDEFINED, CODE_OUTPUT_TEXT); } diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java b/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java index a1933076a..514ad1cf0 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java @@ -355,16 +355,16 @@ public class MoreKeySpecSplitTests extends InstrumentationTestCase { } public void testLabelReferece() { - assertTextArray("Label time am", "!text/label_time_am", "AM"); + assertTextArray("Label time am", "!text/keylabel_time_am", "AM"); - assertTextArray("More keys for am pm", "!text/more_keys_for_am_pm", + assertTextArray("More keys for am pm", "!text/morekeys_am_pm", "!fixedColumnOrder!2", "!hasLabels!", "AM", "PM"); - assertTextArray("Settings as more key", "!text/settings_as_more_key", + assertTextArray("Settings as more key", "!text/keyspec_settings", "!icon/settings_key|!code/key_settings"); assertTextArray("Indirect naviagte actions as more key", - "!text/indirect_navigate_actions_as_more_key", + "!text/keyspec_indirect_navigate_actions", "!fixedColumnOrder!2", "!hasLabels!", "Prev|!code/key_action_previous", "!hasLabels!", "Next|!code/key_action_next"); |