resolved conflicts for merge of aca5785a
to master
Change-Id: I01e8af21d6d019859da4a05995e77701a0d9c585main
commit
463339f195
|
@ -84,7 +84,6 @@
|
|||
lo: Lao (Kip)
|
||||
mn: Mongolian (Tugrik)
|
||||
ne: Nepali (Nepalese Rupee)
|
||||
ta_IN: Tamil (Tamil Rupee)
|
||||
th: Thai (Baht)
|
||||
uk: Ukrainian (Hryvnia)
|
||||
vi: Vietnamese (Dong) -->
|
||||
|
@ -92,29 +91,24 @@
|
|||
its unicode, although there is no font glyph for it as of November 2012. -->
|
||||
<!-- TODO: The currency sign of Armenian Dram was created in 2012 and assigned U+058F for
|
||||
its unicode, although there is no font glyph for it as of September 2013. -->
|
||||
<case latin:languageCode="fa|hi|iw|lo|mn|ne|ta|th|uk|vi">
|
||||
<!-- U+00A3: "£" POUND SIGN
|
||||
U+20AC: "€" EURO SIGN
|
||||
U+00A2: "¢" CENT SIGN -->
|
||||
<key-style
|
||||
latin:styleName="currencyKeyStyle"
|
||||
latin:keySpec="!text/keyspec_currency"
|
||||
latin:moreKeys="!text/morekeys_currency" />
|
||||
<key-style
|
||||
latin:styleName="moreCurrency1KeyStyle"
|
||||
latin:keySpec="£" />
|
||||
<key-style
|
||||
latin:styleName="moreCurrency2KeyStyle"
|
||||
latin:keySpec="€" />
|
||||
<key-style
|
||||
latin:styleName="moreCurrency3KeyStyle"
|
||||
latin:keySpec="$"
|
||||
latin:moreKeys="¢" />
|
||||
<key-style
|
||||
latin:styleName="moreCurrency4KeyStyle"
|
||||
latin:keySpec="¢" />
|
||||
<!-- TODO: The currency sign of Russian Ruble was created in 2014 and assigned U+20BD for
|
||||
its unicode, although there is no font glyph for it as of August 2014. -->
|
||||
<case latin:languageCode="fa|hi|iw|lo|mn|ne|th|uk|vi">
|
||||
<include latin:keyboardLayout="@xml/key_styles_currency_generic" />
|
||||
</case>
|
||||
<!-- IN: India (Rupee) -->
|
||||
<!-- si_LK: Sinhala (Sri Lanka) (Sri Lanka Rupee)
|
||||
ta_LK: Tamil (Sri Lanka) (Sri Lanka Rupee) -->
|
||||
<case latin:countryCode="LK">
|
||||
<include latin:keyboardLayout="@xml/key_styles_currency_generic" />
|
||||
</case>
|
||||
<!-- bn_IN: Bengali (India) (Indian Rupee)
|
||||
en_IN: English (India) (Indian Rupee)
|
||||
kn_IN: Kannada (India) (Indian Rupee)
|
||||
ml_IN: Malayalam (India) (Indian Rupee)
|
||||
mr_IN: Marathi (India) (Indian Rupee)
|
||||
ta_IN: Tamil (India) (Indian Rupee)
|
||||
te_IN: Telugu (India) (Indian Rupee)
|
||||
-->
|
||||
<case latin:countryCode="IN">
|
||||
<!-- U+20B9: "₹" INDIAN RUPEE SIGN
|
||||
U+00A3: "£" POUND SIGN
|
||||
|
@ -123,7 +117,7 @@
|
|||
<key-style
|
||||
latin:styleName="currencyKeyStyle"
|
||||
latin:keySpec="₹"
|
||||
latin:moreKeys="!text/morekeys_currency" />
|
||||
latin:moreKeys="!text/morekeys_currency_generic" />
|
||||
<key-style
|
||||
latin:styleName="moreCurrency1KeyStyle"
|
||||
latin:keySpec="£" />
|
||||
|
|
|
@ -0,0 +1,42 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
**
|
||||
** Copyright 2014, The Android Open Source Project
|
||||
**
|
||||
** Licensed under the Apache License, Version 2.0 (the "License");
|
||||
** you may not use this file except in compliance with the License.
|
||||
** You may obtain a copy of the License at
|
||||
**
|
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
**
|
||||
** Unless required by applicable law or agreed to in writing, software
|
||||
** distributed under the License is distributed on an "AS IS" BASIS,
|
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
** See the License for the specific language governing permissions and
|
||||
** limitations under the License.
|
||||
*/
|
||||
-->
|
||||
|
||||
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
|
||||
<!-- U+00A3: "£" POUND SIGN
|
||||
U+20AC: "€" EURO SIGN
|
||||
U+00A2: "¢" CENT SIGN -->
|
||||
<key-style
|
||||
latin:styleName="currencyKeyStyle"
|
||||
latin:keySpec="!text/keyspec_currency"
|
||||
latin:moreKeys="!text/morekeys_currency_generic" />
|
||||
<key-style
|
||||
latin:styleName="moreCurrency1KeyStyle"
|
||||
latin:keySpec="£" />
|
||||
<key-style
|
||||
latin:styleName="moreCurrency2KeyStyle"
|
||||
latin:keySpec="€" />
|
||||
<key-style
|
||||
latin:styleName="moreCurrency3KeyStyle"
|
||||
latin:keySpec="$"
|
||||
latin:moreKeys="¢" />
|
||||
<key-style
|
||||
latin:styleName="moreCurrency4KeyStyle"
|
||||
latin:keySpec="¢" />
|
||||
</merge>
|
|
@ -92,6 +92,8 @@
|
|||
sv: Swedish/nordic
|
||||
sw: Swahili/qwerty
|
||||
ta_IN: Tamil (India)/tamil
|
||||
ta_LK: Tamil (Sri Lanka)/tamil
|
||||
ta_SG: Tamil (Singapore)/tamil
|
||||
te_IN: Telugu (India)/telugu
|
||||
th: Thai/thai
|
||||
tl: Tagalog/spanish
|
||||
|
@ -686,6 +688,22 @@
|
|||
android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"
|
||||
android:isAsciiCapable="false"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_ime_switcher_dark"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="0x6ca12d84"
|
||||
android:imeSubtypeLocale="ta_LK"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"
|
||||
android:isAsciiCapable="false"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_ime_switcher_dark"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="0x785abbd9"
|
||||
android:imeSubtypeLocale="ta_SG"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"
|
||||
android:isAsciiCapable="false"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_ime_switcher_dark"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="0x1e177389"
|
||||
|
|
|
@ -19,29 +19,39 @@
|
|||
-->
|
||||
|
||||
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
|
||||
<!-- U+0B94: "ஔ" TAMIL LETTER AU -->
|
||||
<!-- U+0B94: "ஔ" TAMIL LETTER AU
|
||||
U+0BCC: "ௌ" TAMIL VOWEL SIGN AU -->
|
||||
<Key
|
||||
latin:keySpec="ஔ"
|
||||
latin:moreKeys="ௌ,%"
|
||||
latin:keyHintLabel="1"
|
||||
latin:additionalMoreKeys="1" />
|
||||
<!-- U+0B90: "ஐ" TAMIL LETTER AI -->
|
||||
<!-- U+0B90: "ஐ" TAMIL LETTER AI
|
||||
U+0BC8: "ை" TAMIL VOWEL SIGN AI -->
|
||||
<Key
|
||||
latin:keySpec="ஐ"
|
||||
latin:moreKeys="ை,%"
|
||||
latin:keyHintLabel="2"
|
||||
latin:additionalMoreKeys="2" />
|
||||
<!-- U+0B86: "ஆ" TAMIL LETTER AA -->
|
||||
<!-- U+0B86: "ஆ" TAMIL LETTER AA
|
||||
U+0BBE: "ா" TAMIL VOWEL SIGN AA -->
|
||||
<Key
|
||||
latin:keySpec="ஆ"
|
||||
latin:moreKeys="ா,%"
|
||||
latin:keyHintLabel="3"
|
||||
latin:additionalMoreKeys="3" />
|
||||
<!-- U+0B88: "ஈ" TAMIL LETTER II -->
|
||||
<!-- U+0B88: "ஈ" TAMIL LETTER II
|
||||
U+0BC0: "ீ" TAMIL VOWEL SIGN II -->
|
||||
<Key
|
||||
latin:keySpec="ஈ"
|
||||
latin:moreKeys="ீ,%"
|
||||
latin:keyHintLabel="4"
|
||||
latin:additionalMoreKeys="4" />
|
||||
<!-- U+0B8A: "ஊ" TAMIL LETTER UU -->
|
||||
<!-- U+0B8A: "ஊ" TAMIL LETTER UU
|
||||
U+0BC2: "ூ" TAMIL VOWEL SIGN UU -->
|
||||
<Key
|
||||
latin:keySpec="ஊ"
|
||||
latin:moreKeys="ூ,%"
|
||||
latin:keyHintLabel="5"
|
||||
latin:additionalMoreKeys="5" />
|
||||
<!-- U+0BAE: "ம" TAMIL LETTER MA -->
|
||||
|
|
|
@ -20,21 +20,31 @@
|
|||
|
||||
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
|
||||
<!-- U+0B93: "ஓ" TAMIL LETTER OO
|
||||
U+0BCB: "ோ" TAMIL VOWEL SIGN OO
|
||||
U+0BD0: "ௐ" TAMIL OM -->
|
||||
<Key
|
||||
latin:keySpec="ஓ"
|
||||
latin:moreKeys="ௐ" />
|
||||
<!-- U+0B8F: "ஏ" TAMIL LETTER EE -->
|
||||
<Key latin:keySpec="ஏ" />
|
||||
latin:moreKeys="ோ,ௐ" />
|
||||
<!-- U+0B8F: "ஏ" TAMIL LETTER EE
|
||||
U+0BC7: "ே" TAMIL VOWEL SIGN EE -->
|
||||
<Key
|
||||
latin:keySpec="ஏ"
|
||||
latin:moreKeys="ே" />
|
||||
<!-- U+0B85: "அ" TAMIL LETTER A
|
||||
U+0B83: "ஃ" TAMIL SIGN VISARGA -->
|
||||
<Key
|
||||
latin:keySpec="அ"
|
||||
latin:moreKeys="ஃ" />
|
||||
<!-- U+0B87: "இ" TAMIL LETTER I -->
|
||||
<Key latin:keySpec="இ" />
|
||||
<!-- U+0B89: "உ" TAMIL LETTER U -->
|
||||
<Key latin:keySpec="உ" />
|
||||
<!-- U+0B87: "இ" TAMIL LETTER I
|
||||
U+0BBF: "ி" TAMIL VOWEL SIGN I -->
|
||||
<Key
|
||||
latin:keySpec="இ"
|
||||
latin:moreKeys="ி" />
|
||||
<!-- U+0B89: "உ" TAMIL LETTER U
|
||||
U+0BC1: "ு" TAMIL VOWEL SIGN U -->
|
||||
<Key
|
||||
latin:keySpec="உ"
|
||||
latin:moreKeys="ு" />
|
||||
<!-- U+0BB1: "ற" TAMIL LETTER RRA -->
|
||||
<Key latin:keySpec="ற" />
|
||||
<!-- U+0BAA: "ப" TAMIL LETTER PA -->
|
||||
|
|
|
@ -19,10 +19,16 @@
|
|||
-->
|
||||
|
||||
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
|
||||
<!-- U+0B92: "ஒ" TAMIL LETTER O -->
|
||||
<Key latin:keySpec="ஒ" />
|
||||
<!-- U+0B8E: "எ" TAMIL LETTER E -->
|
||||
<Key latin:keySpec="எ" />
|
||||
<!-- U+0B92: "ஒ" TAMIL LETTER O
|
||||
U+0BCA: "ொ" TAMIL VOWEL SIGN O -->
|
||||
<Key
|
||||
latin:keySpec="ஒ"
|
||||
latin:moreKeys="ொ" />
|
||||
<!-- U+0B8E: "எ" TAMIL LETTER E
|
||||
U+0BC6: "ெ" TAMIL VOWEL SIGN E -->
|
||||
<Key
|
||||
latin:keySpec="எ"
|
||||
latin:moreKeys="ெ" />
|
||||
<!-- U+0BCD: "்" TAMIL SIGN VIRAMA -->
|
||||
<Key latin:keySpec="்" />
|
||||
<!-- U+0BB0: "ர" TAMIL LETTER RA -->
|
||||
|
|
|
@ -693,9 +693,10 @@ public class Key implements Comparable<Key> {
|
|||
}
|
||||
|
||||
public final int getMoreKeyLabelFlags() {
|
||||
return hasLabelsInMoreKeys()
|
||||
final int labelSizeFlag = hasLabelsInMoreKeys()
|
||||
? LABEL_FLAGS_FOLLOW_KEY_LABEL_RATIO
|
||||
: LABEL_FLAGS_FOLLOW_KEY_LETTER_RATIO;
|
||||
return labelSizeFlag | LABEL_FLAGS_AUTO_X_SCALE;
|
||||
}
|
||||
|
||||
public final boolean needsDividersInMoreKeys() {
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -25,7 +25,7 @@ import java.util.ArrayList;
|
|||
|
||||
@SmallTest
|
||||
public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase {
|
||||
private static final int NUMBER_OF_SUBTYPES = 77;
|
||||
private static final int NUMBER_OF_SUBTYPES = 79;
|
||||
private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 45;
|
||||
private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;
|
||||
|
||||
|
|
|
@ -42,6 +42,14 @@ public final class Sinhala extends LayoutBase {
|
|||
@Override
|
||||
public ExpectedKey getAlphabetKey() { return SINHALA_ALPHABET_KEY; }
|
||||
|
||||
@Override
|
||||
public ExpectedKey getCurrencyKey() { return CURRENCY_RUPEE; }
|
||||
|
||||
@Override
|
||||
public ExpectedKey[] getOtherCurrencyKeys() {
|
||||
return SymbolsShifted.CURRENCIES_OTHER_GENERIC;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ExpectedKey[] getRightShiftKeys(final boolean isPhone) {
|
||||
return isPhone ? EMPTY_KEYS : EXCLAMATION_AND_QUESTION_MARKS;
|
||||
|
@ -51,6 +59,10 @@ public final class Sinhala extends LayoutBase {
|
|||
// U+0D86: "ආ" SINHALA LETTER AAYANNA
|
||||
private static final ExpectedKey SINHALA_ALPHABET_KEY = key(
|
||||
"\u0D85,\u0D86", Constants.CODE_SWITCH_ALPHA_SYMBOL);
|
||||
|
||||
// U+0DBB/U+0DD4: "රු" SINHALA LETTER RAYANNA/SINHALA VOWEL SIGN KETTI PAA-PILLA
|
||||
private static final ExpectedKey CURRENCY_RUPEE = key("\u0DBB\u0DD4",
|
||||
Symbols.CURRENCY_GENERIC_MORE_KEYS);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -41,14 +41,6 @@ public final class Tamil extends LayoutBase {
|
|||
@Override
|
||||
public ExpectedKey getAlphabetKey() { return TAMIL_ALPHABET_KEY; }
|
||||
|
||||
@Override
|
||||
public ExpectedKey getCurrencyKey() { return CURRENCY_RUPEE; }
|
||||
|
||||
@Override
|
||||
public ExpectedKey[] getOtherCurrencyKeys() {
|
||||
return SymbolsShifted.CURRENCIES_OTHER_GENERIC;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ExpectedKey[] getLeftShiftKeys(final boolean isPhone) {
|
||||
return EMPTY_KEYS;
|
||||
|
@ -64,10 +56,6 @@ public final class Tamil extends LayoutBase {
|
|||
// U+0BB4/U+0BCD: "ழ்" TAMIL LETTER LLLA/TAMIL SIGN VIRAMA
|
||||
private static final ExpectedKey TAMIL_ALPHABET_KEY = key(
|
||||
"\u0BA4\u0BAE\u0BBF\u0BB4\u0BCD", Constants.CODE_SWITCH_ALPHA_SYMBOL);
|
||||
|
||||
// U+0BF9: "௹" TAMIL RUPEE SIGN
|
||||
private static final ExpectedKey CURRENCY_RUPEE = key("\u0BF9",
|
||||
Symbols.CURRENCY_GENERIC_MORE_KEYS);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -81,15 +69,20 @@ public final class Tamil extends LayoutBase {
|
|||
private static final ExpectedKey[][] ALPHABET_COMMON = new ExpectedKeyboardBuilder()
|
||||
.setKeysOfRow(1,
|
||||
// U+0B94: "ஔ" TAMIL LETTER AU
|
||||
key("\u0B94", moreKey("1")),
|
||||
// U+0BCC: "ௌ" TAMIL VOWEL SIGN AU
|
||||
key("\u0B94", joinMoreKeys("\u0BCC", "1")),
|
||||
// U+0B90: "ஐ" TAMIL LETTER AI
|
||||
key("\u0B90", moreKey("2")),
|
||||
// U+0BC8: "ை" TAMIL VOWEL SIGN AI
|
||||
key("\u0B90", joinMoreKeys("\u0BC8", "2")),
|
||||
// U+0B86: "ஆ" TAMIL LETTER AA
|
||||
key("\u0B86", moreKey("3")),
|
||||
// U+0BBE: "ா" TAMIL VOWEL SIGN AA
|
||||
key("\u0B86", joinMoreKeys("\u0BBE", "3")),
|
||||
// U+0B88: "ஈ" TAMIL LETTER II
|
||||
key("\u0B88", moreKey("4")),
|
||||
// U+0BC0: "ீ" TAMIL VOWEL SIGN II
|
||||
key("\u0B88", joinMoreKeys("\u0BC0", "4")),
|
||||
// U+0B8A: "ஊ" TAMIL LETTER UU
|
||||
key("\u0B8A", moreKey("5")),
|
||||
// U+0BC2: "ூ" TAMIL VOWEL SIGN UU
|
||||
key("\u0B8A", joinMoreKeys("\u0BC2","5")),
|
||||
// U+0BAE: "ம" TAMIL LETTER MA
|
||||
key("\u0BAE", moreKey("6")),
|
||||
// U+0BA9: "ன" TAMIL LETTER NNNA
|
||||
|
@ -104,18 +97,24 @@ public final class Tamil extends LayoutBase {
|
|||
"\u0B9E")
|
||||
.setKeysOfRow(2,
|
||||
// U+0B93: "ஓ" TAMIL LETTER OO
|
||||
// U+0BCB: "ோ" TAMIL VOWEL SIGN OO
|
||||
// U+0BD0: "ௐ" TAMIL OM
|
||||
key("\u0B93", moreKey("\u0BD0")),
|
||||
key("\u0B93", joinMoreKeys("\u0BCB", "\u0BD0")),
|
||||
// U+0B8F: "ஏ" TAMIL LETTER EE
|
||||
"\u0B8F",
|
||||
// U+0BC7: "ே" TAMIL VOWEL SIGN EE
|
||||
key("\u0B8F", moreKey("\u0BC7")),
|
||||
// U+0B85: "அ" TAMIL LETTER A
|
||||
// U+0B83: "ஃ" TAMIL SIGN VISARGA
|
||||
key("\u0B85", moreKey("\u0B83")),
|
||||
// U+0B87: "இ" TAMIL LETTER I
|
||||
// U+0BBF: "ி" TAMIL VOWEL SIGN I
|
||||
key("\u0B87", moreKey("\u0BBF")),
|
||||
// U+0B89: "உ" TAMIL LETTER U
|
||||
// U+0BC1: "ு" TAMIL VOWEL SIGN U
|
||||
key("\u0B89", moreKey("\u0BC1")),
|
||||
// U+0BB1: "ற" TAMIL LETTER RRA
|
||||
// U+0BAA: "ப" TAMIL LETTER PA
|
||||
"\u0B87", "\u0B89", "\u0BB1", "\u0BAA",
|
||||
"\u0BB1", "\u0BAA",
|
||||
// U+0B95: "க" TAMIL LETTER KA
|
||||
// U+0BB9: "ஹ" TAMIL LETTER HA
|
||||
// U+0B95/U+0BCD/U+0BB7:
|
||||
|
@ -133,7 +132,11 @@ public final class Tamil extends LayoutBase {
|
|||
"\u0B9F")
|
||||
.setKeysOfRow(3,
|
||||
// U+0B92: "ஒ" TAMIL LETTER O
|
||||
// U+0BCA: "ொ" TAMIL VOWEL SIGN O
|
||||
key("\u0B92", moreKey("\u0BCA")),
|
||||
// U+0B8E: "எ" TAMIL LETTER E
|
||||
// U+0BC6: "ெ" TAMIL VOWEL SIGN E
|
||||
key("\u0B8E", moreKey("\u0BC6")),
|
||||
// U+0BCD: "்" TAMIL SIGN VIRAMA
|
||||
// U+0BB0: "ர" TAMIL LETTER RA
|
||||
// U+0BB5: "வ" TAMIL LETTER VA
|
||||
|
@ -141,8 +144,7 @@ public final class Tamil extends LayoutBase {
|
|||
// U+0BB2: "ல" TAMIL LETTER LA
|
||||
// U+0BB3: "ள" TAMIL LETTER LLA
|
||||
// U+0BAF: "ய" TAMIL LETTER YA
|
||||
"\u0B92", "\u0B8E", "\u0BCD", "\u0BB0", "\u0BB5", "\u0BB4", "\u0BB2", "\u0BB3",
|
||||
"\u0BAF",
|
||||
"\u0BCD", "\u0BB0", "\u0BB5", "\u0BB4", "\u0BB2", "\u0BB3", "\u0BAF",
|
||||
// U+0BB7: "ஷ" TAMIL LETTER SSA
|
||||
// U+0B9C: "ஜ" TAMIL LETTER JA
|
||||
key("\u0BB7", moreKey("\u0B9C")))
|
||||
|
|
|
@ -19,8 +19,11 @@ package com.android.inputmethod.keyboard.layout.tests;
|
|||
import android.test.suitebuilder.annotation.SmallTest;
|
||||
|
||||
import com.android.inputmethod.keyboard.layout.LayoutBase;
|
||||
import com.android.inputmethod.keyboard.layout.Symbols;
|
||||
import com.android.inputmethod.keyboard.layout.SymbolsShifted;
|
||||
import com.android.inputmethod.keyboard.layout.Tamil;
|
||||
import com.android.inputmethod.keyboard.layout.Tamil.TamilCustomizer;
|
||||
import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
|
@ -30,8 +33,24 @@ import java.util.Locale;
|
|||
@SmallTest
|
||||
public final class TestsTamilIN extends LayoutTestsBase {
|
||||
private static final Locale LOCALE = new Locale("ta", "IN");
|
||||
private static final LayoutBase LAYOUT = new Tamil(new TamilCustomizer(LOCALE));
|
||||
private static final LayoutBase LAYOUT = new Tamil(new TamilINCustomizer(LOCALE));
|
||||
|
||||
@Override
|
||||
LayoutBase getLayout() { return LAYOUT; }
|
||||
|
||||
private static class TamilINCustomizer extends TamilCustomizer {
|
||||
public TamilINCustomizer(final Locale locale) { super(locale); }
|
||||
|
||||
@Override
|
||||
public ExpectedKey getCurrencyKey() { return CURRENCY_RUPEE; }
|
||||
|
||||
@Override
|
||||
public ExpectedKey[] getOtherCurrencyKeys() {
|
||||
return SymbolsShifted.CURRENCIES_OTHER_GENERIC;
|
||||
}
|
||||
|
||||
// U+20B9: "₹" INDIAN RUPEE SIGN
|
||||
private static final ExpectedKey CURRENCY_RUPEE = key("\u20B9",
|
||||
Symbols.CURRENCY_GENERIC_MORE_KEYS);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,56 @@
|
|||
/*
|
||||
* Copyright (C) 2014 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.inputmethod.keyboard.layout.tests;
|
||||
|
||||
import android.test.suitebuilder.annotation.SmallTest;
|
||||
|
||||
import com.android.inputmethod.keyboard.layout.LayoutBase;
|
||||
import com.android.inputmethod.keyboard.layout.Symbols;
|
||||
import com.android.inputmethod.keyboard.layout.SymbolsShifted;
|
||||
import com.android.inputmethod.keyboard.layout.Tamil;
|
||||
import com.android.inputmethod.keyboard.layout.Tamil.TamilCustomizer;
|
||||
import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* ta_LK: Tamil (Sri Lanka)/tamil
|
||||
*/
|
||||
@SmallTest
|
||||
public final class TestsTamilLK extends LayoutTestsBase {
|
||||
private static final Locale LOCALE = new Locale("ta", "LK");
|
||||
private static final LayoutBase LAYOUT = new Tamil(new TamilLKCustomizer(LOCALE));
|
||||
|
||||
@Override
|
||||
LayoutBase getLayout() { return LAYOUT; }
|
||||
|
||||
private static class TamilLKCustomizer extends TamilCustomizer {
|
||||
public TamilLKCustomizer(final Locale locale) { super(locale); }
|
||||
|
||||
@Override
|
||||
public ExpectedKey getCurrencyKey() { return CURRENCY_RUPEE; }
|
||||
|
||||
@Override
|
||||
public ExpectedKey[] getOtherCurrencyKeys() {
|
||||
return SymbolsShifted.CURRENCIES_OTHER_GENERIC;
|
||||
}
|
||||
|
||||
// U+0DBB/U+0DD4: "රු" SINHALA LETTER RAYANNA/SINHALA VOWEL SIGN KETTI PAA-PILLA
|
||||
private static final ExpectedKey CURRENCY_RUPEE = key("\u0DBB\u0DD4",
|
||||
Symbols.CURRENCY_GENERIC_MORE_KEYS);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,37 @@
|
|||
/*
|
||||
* Copyright (C) 2014 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.inputmethod.keyboard.layout.tests;
|
||||
|
||||
import android.test.suitebuilder.annotation.SmallTest;
|
||||
|
||||
import com.android.inputmethod.keyboard.layout.LayoutBase;
|
||||
import com.android.inputmethod.keyboard.layout.Tamil;
|
||||
import com.android.inputmethod.keyboard.layout.Tamil.TamilCustomizer;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* ta_SG: Tamil (Singapore)/tamil
|
||||
*/
|
||||
@SmallTest
|
||||
public final class TestsTamilSG extends LayoutTestsBase {
|
||||
private static final Locale LOCALE = new Locale("ta", "SG");
|
||||
private static final LayoutBase LAYOUT = new Tamil(new TamilCustomizer(LOCALE));
|
||||
|
||||
@Override
|
||||
LayoutBase getLayout() { return LAYOUT; }
|
||||
}
|
|
@ -23,6 +23,6 @@
|
|||
U+0996: "ख" BENGALI LETTER KHA
|
||||
U+0997: "ग" BENGALI LETTER GA -->
|
||||
<string name="keylabel_to_alpha">কখগ</string>
|
||||
<!-- U+09F3: "৳" BENGALI RUPEE SIGN -->
|
||||
<string name="keyspec_currency">৳</string>
|
||||
<!-- U+20B9: "₹" INDIAN RUPEE SIGN -->
|
||||
<string name="keyspec_currency">₹</string>
|
||||
</resources>
|
||||
|
|
|
@ -22,4 +22,6 @@
|
|||
U+0D85: "අ" SINHALA LETTER AYANNA
|
||||
U+0D86: "ආ" SINHALA LETTER AAYANNA -->
|
||||
<string name="keylabel_to_alpha">අ,ආ</string>
|
||||
<!-- U+0DBB/U+0DD4: "රු" SINHALA LETTER RAYANNA/SINHALA VOWEL SIGN KETTI PAA-PILLA -->
|
||||
<string name="keyspec_currency">රු</string>
|
||||
</resources>
|
||||
|
|
|
@ -0,0 +1,28 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
**
|
||||
** Copyright 2014, The Android Open Source Project
|
||||
**
|
||||
** Licensed under the Apache License, Version 2.0 (the "License");
|
||||
** you may not use this file except in compliance with the License.
|
||||
** You may obtain a copy of the License at
|
||||
**
|
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
**
|
||||
** Unless required by applicable law or agreed to in writing, software
|
||||
** distributed under the License is distributed on an "AS IS" BASIS,
|
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
** See the License for the specific language governing permissions and
|
||||
** limitations under the License.
|
||||
*/
|
||||
-->
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<!-- Label for "switch to alphabetic" key.
|
||||
U+0BA4: "த" TAMIL LETTER TA
|
||||
U+0BAE/U+0BBF: "மி" TAMIL LETTER MA/TAMIL VOWEL SIGN I
|
||||
U+0BB4/U+0BCD: "ழ்" TAMIL LETTER LLLA/TAMIL SIGN VIRAMA -->
|
||||
<string name="keylabel_to_alpha">தமிழ்</string>
|
||||
<!-- U+0DBB/U+0DD4: "රු" SINHALA LETTER RAYANNA/SINHALA VOWEL SIGN KETTI PAA-PILLA -->
|
||||
<string name="keyspec_currency">රු</string>
|
||||
</resources>
|
|
@ -0,0 +1,26 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
**
|
||||
** Copyright 2014, The Android Open Source Project
|
||||
**
|
||||
** Licensed under the Apache License, Version 2.0 (the "License");
|
||||
** you may not use this file except in compliance with the License.
|
||||
** You may obtain a copy of the License at
|
||||
**
|
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
**
|
||||
** Unless required by applicable law or agreed to in writing, software
|
||||
** distributed under the License is distributed on an "AS IS" BASIS,
|
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
** See the License for the specific language governing permissions and
|
||||
** limitations under the License.
|
||||
*/
|
||||
-->
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<!-- Label for "switch to alphabetic" key.
|
||||
U+0BA4: "த" TAMIL LETTER TA
|
||||
U+0BAE/U+0BBF: "மி" TAMIL LETTER MA/TAMIL VOWEL SIGN I
|
||||
U+0BB4/U+0BCD: "ழ்" TAMIL LETTER LLLA/TAMIL SIGN VIRAMA -->
|
||||
<string name="keylabel_to_alpha">தமிழ்</string>
|
||||
</resources>
|
|
@ -87,7 +87,7 @@
|
|||
U+20B1: "₱" PESO SIGN -->
|
||||
<string name="morekeys_currency_dollar">¢,£,€,¥,₱</string>
|
||||
<string name="keyspec_currency">$</string>
|
||||
<string name="morekeys_currency">$,¢,€,£,¥,₱</string>
|
||||
<string name="morekeys_currency_generic">$,¢,€,£,¥,₱</string>
|
||||
<string name="morekeys_punctuation">"!autoColumnOrder!8,\\,,?,!,#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,',@,:,-,\",+,\\%,&"</string>
|
||||
<string name="morekeys_tablet_punctuation">"!autoColumnOrder!7,\\,,',#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,@,:,-,\",+,\\%,&"</string>
|
||||
<!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
|
||||
|
|
Loading…
Reference in New Issue