am 79d992cc: Merge "Use Devanagari Danda letter as full stop on Hindi keyboard" (5b2dd422) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml-sw600dp/key_period.xml

+0 −11

Original line number	Diff line number	Diff line
		@@ -24,17 +24,6 @@
		<!-- The table period key which may have different label depending on locale -->
		<!-- Kept as a separate file for cleaner overriding by an overlay. -->
		<switch>
		<case
		latin:languageCode="hi"
		latin:keyboardLayoutSet="hindi_compact"
		>
		<!-- U+0964: "।" DEVANAGARI DANDA -->
		<Key
		latin:keySpec="\u0964"
		latin:keyLabelFlags="hasPopupHint"
		latin:moreKeys="!autoColumnOrder!8,\\,,.,',#,),(,/,;,@,:,-,",+,\\%,&"
		latin:backgroundType="functional" />
		</case>
		<case
		latin:keyboardLayoutSet="dvorak"
		>

java/res/xml/key_period.xml

+0 −11

Original line number	Diff line number	Diff line
		@@ -22,17 +22,6 @@
		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
		>
		<switch>
		<case
		latin:languageCode="hi"
		latin:keyboardLayoutSet="hindi_compact"
		>
		<!-- U+0964: "।" DEVANAGARI DANDA -->
		<Key
		latin:keySpec="\u0964"
		latin:keyLabelFlags="hasPopupHint"
		latin:moreKeys="!autoColumnOrder!9,\\,,.,?,!,#,),(,/,;,',@,:,-,",+,\\%,&"
		latin:backgroundType="functional" />
		</case>
		<case
		latin:languageCode="ne"
		latin:keyboardLayoutSet="nepali_traditional"

java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java

+120 −110

File changed.

Preview size limit exceeded, changes collapsed.

tests/src/com/android/inputmethod/keyboard/layout/Hindi.java

+0 −47

Original line number	Diff line number	Diff line
		@@ -21,9 +21,6 @@ import static com.android.inputmethod.keyboard.layout.DevanagariLetterConstants.
		import com.android.inputmethod.keyboard.KeyboardId;
		import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
		import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
		import com.android.inputmethod.latin.Constants;

		import java.util.Locale;

		/**
		* The Hindi keyboard.
		@@ -38,50 +35,6 @@ public final class Hindi extends LayoutBase {
		@Override
		public String getName() { return LAYOUT_NAME; }

		public static class HindiCustomizer extends LayoutCustomizer {
		public HindiCustomizer(final Locale locale) { super(locale); }

		@Override
		public ExpectedKey getAlphabetKey() { return HINDI_ALPHABET_KEY; }

		@Override
		public ExpectedKey getSymbolsKey() { return HINDI_SYMBOLS_KEY; }

		@Override
		public ExpectedKey getBackToSymbolsKey() { return HINDI_BACK_TO_SYMBOLS_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;
		}

		// U+0915: "क" DEVANAGARI LETTER KA
		// U+0916: "ख" DEVANAGARI LETTER KHA
		// U+0917: "ग" DEVANAGARI LETTER GA
		private static final ExpectedKey HINDI_ALPHABET_KEY = key(
		"\u0915\u0916\u0917", Constants.CODE_SWITCH_ALPHA_SYMBOL);
		// U+0967: "१" DEVANAGARI DIGIT ONE
		// U+0968: "२" DEVANAGARI DIGIT TWO
		// U+0969: "३" DEVANAGARI DIGIT THREE
		private static final String HINDI_SYMBOLS_LABEL = "?\u0967\u0968\u0969";
		private static final ExpectedKey HINDI_SYMBOLS_KEY = key(HINDI_SYMBOLS_LABEL,
		Constants.CODE_SWITCH_ALPHA_SYMBOL);
		private static final ExpectedKey HINDI_BACK_TO_SYMBOLS_KEY = key(HINDI_SYMBOLS_LABEL,
		Constants.CODE_SHIFT);

		// U+20B9: "₹" INDIAN RUPEE SIGN
		private static final ExpectedKey CURRENCY_RUPEE = key("\u20B9",
		Symbols.CURRENCY_GENERIC_MORE_KEYS);
		}

		@Override
		ExpectedKey[][] getCommonAlphabetLayout(boolean isPhone) { return ALPHABET_COMMON; }

tests/src/com/android/inputmethod/keyboard/layout/HindiCompact.java

+1 −22

Original line number	Diff line number	Diff line
		@@ -18,10 +18,10 @@ package com.android.inputmethod.keyboard.layout;

		import static com.android.inputmethod.keyboard.layout.DevanagariLetterConstants.*;

		import com.android.inputmethod.keyboard.layout.Hindi.HindiCustomizer;
		import com.android.inputmethod.keyboard.layout.Hindi.HindiSymbols;
		import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
		import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
		import com.android.inputmethod.keyboard.layout.tests.HindiCustomizer;

		import java.util.Locale;

		@@ -45,27 +45,6 @@ public final class HindiCompact extends LayoutBase {
		public ExpectedKey[] getLeftShiftKeys(final boolean isPhone) {
		return EMPTY_KEYS;
		}

		@Override
		public ExpectedKey[] getKeysRightToSpacebar(final boolean isPhone) {
		// U+0964: "।" DEVANAGARI DANDA
		final ExpectedKey periodKey = key("\u0964", getPunctuationMoreKeys(isPhone));
		return joinKeys(periodKey);
		}

		@Override
		public ExpectedKey[] getPunctuationMoreKeys(final boolean isPhone) {
		return isPhone ? HINDI_PHONE_PUNCTUATION_MORE_KEYS : HINDI_TABLET_PUNCTUATION_MORE_KEYS;
		}

		// Punctuation more keys for phone form factor.
		private static final ExpectedKey[] HINDI_PHONE_PUNCTUATION_MORE_KEYS = joinKeys(
		",", ".", "?", "!", "#", ")", "(", "/", ";",
		"'", "@", ":", "-", "\"", "+", "%", "&");
		// Punctuation more keys for tablet form factor.
		private static final ExpectedKey[] HINDI_TABLET_PUNCTUATION_MORE_KEYS = joinKeys(
		",", ".", "'", "#", ")", "(", "/", ";",
		"@", ":", "-", "\"", "+", "%", "&");
		}

		@Override