Merge "Add hindi_compact keyboard" (23431879) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/values/strings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -361,6 +361,10 @@
		<!-- Description for "LANGUAGE_NAME" (Traditional) keyboard subtype [CHAR LIMIT=25]
		(Traditional) can be an abbreviation to fit in the CHAR LIMIT. -->
		<string name="subtype_generic_traditional"><xliff:g id="LANGUAGE_NAME" example="Nepali">%s</xliff:g> (Traditional)</string>
		<!-- Description for "LANGUAGE_NAME" (Compact) keyboard subtype [CHAR LIMIT=25]
		(Compact) can be an abbreviation to fit in the CHAR LIMIT.
		TODO: Remove translatable=false once we are settled down with the naming. -->
		<string name="subtype_generic_compact" translatable="false"><xliff:g id="LANGUAGE_NAME" example="Hindi">%s</xliff:g> (Compact)</string>
		<!-- TODO: Uncomment once we can handle IETF language tag with script name specified.
		Description for Serbian Cyrillic keyboard subtype [CHAR LIMIT=25]
		(Cyrillic) can be an abbreviation to fit in the CHAR LIMIT.

+22 −7

Original line number	Diff line number	Diff line
		@@ -28,6 +28,19 @@
		latin:moreKeys="!text/morekeys_tablet_comma"
		latin:backgroundType="functional"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		<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>
		<default>
		<Key
		latin:keySpec="!text/keyspec_tablet_period"
		latin:keyHintLabel="!text/keyhintlabel_tablet_period"
		@@ -35,4 +48,6 @@
		latin:moreKeys="!text/morekeys_tablet_period"
		latin:backgroundType="functional"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		</default>
		</switch>
		</merge>

0 → 100644

+54 −0

Original line number	Diff line number	Diff line
		<?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"
		>
		<include
		latin:keyboardLayout="@xml/key_styles_common" />
		<Row
		latin:keyWidth="8.182%p"
		>
		<include
		latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
		<Key
		latin:keyStyle="deleteKeyStyle"
		latin:keyWidth="fillRight" />
		</Row>
		<Row
		latin:keyWidth="8.182%p"
		>
		<include
		latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
		<Key
		latin:keyStyle="enterKeyStyle"
		latin:keyWidth="fillRight" />
		</Row>
		<Row
		latin:keyWidth="8.182%p"
		>
		<include
		latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
		<include
		latin:keyboardLayout="@xml/keys_exclamation_question" />
		</Row>
		<include
		latin:keyboardLayout="@xml/row_qwerty4" />
		</merge>

+17 −0

Original line number	Diff line number	Diff line
		@@ -25,9 +25,26 @@
		<merge
		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
		>
		<switch>
		<case
		latin:keyboardLayoutSet="hindi_compact"
		>
		<!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
		U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
		U+093C: "़" DEVANAGARI SIGN NUKTA -->
		<key-style
		latin:styleName="moreKeysDevanagariSignAnusvara"
		latin:moreKeys="ः,ँ,़" />
		</case>
		<default>
		<key-style
		latin:styleName="moreKeysDevanagariSignAnusvara" />
		</default>
		</switch>
		<!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
		<key-style
		latin:styleName="baseKeyDevanagariSignAnusvara"
		latin:parentStyle="moreKeysDevanagariSignAnusvara"
		latin:keySpec="ं"
		latin:keyLabelFlags="fontNormal" />
		</merge>

+15 −0

Original line number	Diff line number	Diff line
		@@ -25,9 +25,24 @@
		<merge
		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
		>
		<switch>
		<case
		latin:keyboardLayoutSet="hindi_compact"
		>
		<!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
		<key-style
		latin:styleName="moreKeysDevanagariSignVirama"
		latin:moreKeys="्" />
		</case>
		<default>
		<key-style
		latin:styleName="moreKeysDevanagariSignVirama" />
		</default>
		</switch>
		<!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
		<key-style
		latin:styleName="baseKeyDevanagariSignVirama"
		latin:parentStyle="moreKeysDevanagariSignVirama"
		latin:keySpec="्"
		latin:keyLabelFlags="fontNormal" />
		</merge>