Merge "Cleanup and remove redundant more keys on phones" (382094a7) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml-sw600dp/keys_comma_period.xml

0 → 100644

+103 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2013, 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"
		>
		<switch>
		<case
		latin:mode="email\|url"
		>
		<Key
		latin:keyLabel=","
		latin:keyHintLabel="-"
		latin:moreKeys="-"
		latin:backgroundType="functional"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		<Key
		latin:keyLabel="."
		latin:keyHintLabel="_"
		latin:moreKeys="_"
		latin:backgroundType="functional"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		</case>
		<case
		latin:languageCode="ar"
		>
		<Key
		latin:keyLabel="!text/keylabel_for_apostrophe"
		latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
		latin:moreKeys="!text/more_keys_for_apostrophe"
		latin:backgroundType="functional"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		<Key
		latin:keyLabel="."
		latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
		latin:keyLabelFlags="hasPopupHint"
		latin:moreKeys="!text/more_keys_for_arabic_diacritics"
		latin:backgroundType="functional"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		</case>
		<case
		latin:languageCode="fa"
		>
		<Key
		latin:keyLabel="!text/keylabel_for_apostrophe"
		latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
		latin:keyLabelFlags="hasPopupHint"
		latin:moreKeys="!text/more_keys_for_apostrophe"
		latin:backgroundType="functional"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		<Key
		latin:keyLabel="."
		latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
		latin:keyLabelFlags="hasPopupHint"
		latin:moreKeys="!text/more_keys_for_arabic_diacritics"
		latin:backgroundType="functional"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		</case>
		<case
		latin:languageCode="hy"
		>
		<!-- U+055D: "՝" ARMENIAN COMMA -->
		<Key
		latin:keyLabel="՝"
		latin:backgroundType="functional" />
		<!-- U+0589: "։" ARMENIAN FULL STOP -->
		<Key
		latin:keyLabel="։"
		latin:keyLabelFlags="hasPopupHint"
		latin:backgroundType="functional"
		latin:moreKeys="!text/more_keys_for_punctuation" />
		</case>
		<default>
		<Key
		latin:keyLabel="!text/keylabel_for_tablet_comma"
		latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma"
		latin:backgroundType="functional"
		latin:moreKeys="!text/more_keys_for_tablet_comma" />
		<Key
		latin:keyLabel="."
		latin:keyHintLabel="!text/keyhintlabel_for_period"
		latin:backgroundType="functional"
		latin:moreKeys="!text/more_keys_for_period" />
		</default>
		</switch>
		</merge>

java/res/xml/keys_comma_period.xml

+2 −18

Original line number	Diff line number	Diff line
		@@ -22,22 +22,6 @@
		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
		>
		<switch>
		<case
		latin:mode="email\|url"
		>
		<Key
		latin:keyLabel=","
		latin:keyHintLabel="-"
		latin:moreKeys="-"
		latin:backgroundType="functional"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		<Key
		latin:keyLabel="."
		latin:keyHintLabel="_"
		latin:moreKeys="_"
		latin:backgroundType="functional"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		</case>
		<case
		latin:languageCode="ar"
		>
		@@ -95,9 +79,9 @@
		latin:moreKeys="!text/more_keys_for_tablet_comma" />
		<Key
		latin:keyLabel="."
		latin:keyHintLabel="!text/keyhintlabel_for_tablet_period"
		latin:keyHintLabel="!text/keyhintlabel_for_period"
		latin:backgroundType="functional"
		latin:moreKeys="!text/more_keys_for_tablet_period" />
		latin:moreKeys="!text/more_keys_for_period" />
		</default>
		</switch>
		</merge>

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -209,8 +209,8 @@ public final class KeyboardTextsSet {
		/* 104 */ "keylabel_for_tablet_comma",
		/* 105 */ "keyhintlabel_for_tablet_comma",
		/* 106 */ "more_keys_for_tablet_comma",
		/* 107 */ "keyhintlabel_for_tablet_period",
		/* 108 */ "more_keys_for_tablet_period",
		/* 107 */ "keyhintlabel_for_period",
		/* 108 */ "more_keys_for_period",
		/* 109 */ "keylabel_for_apostrophe",
		/* 110 */ "keyhintlabel_for_apostrophe",
		/* 111 */ "more_keys_for_apostrophe",

tools/make-keyboard-text/res/values-ca/donottranslate-more-keys.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@
		<string name="more_keys_for_l">l·l,ł</string>
		<!-- U+00B7: "·" MIDDLE DOT -->
		<string name="more_keys_for_punctuation">"!fixedColumnOrder!4,·,!,\\,,\?,:,;,\@"</string>
		<string name="more_keys_for_tablet_period">\?,·</string>
		<string name="more_keys_for_period">\?,·</string>
		<!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA -->
		<string name="keylabel_for_spanish_row2_10">ç</string>
		</resources>

tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@
		<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
		<string name="more_keys_for_tablet_comma">"!,¡"</string>
		<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
		<string name="more_keys_for_tablet_period">"\?,¿"</string>
		<string name="more_keys_for_period">"\?,¿"</string>
		<string name="keylabel_for_apostrophe">\"</string>
		<string name="keyhintlabel_for_apostrophe">\'</string>
		<string name="more_keys_for_apostrophe">\'</string>