Merge "Remove redandant key from popup mini keyboard which has settings key" (82730b0e) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/values/donottranslate-altchars.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -47,11 +47,7 @@
		<string name="alternates_for_currency_dollar">¢,£,€,¥,₱</string>
		<string name="alternates_for_currency_euro">¢,£,$,¥,₱</string>
		<string name="alternates_for_currency_pound">¢,$,€,¥,₱</string>
		<string name="alternates_for_mic">"\@drawable/sym_keyboard_settings\|\@integer/key_settings,\@drawable/sym_keyboard_mic\|\@integer/key_voice"</string>
		<string name="alternates_for_smiley">":-)\|:-) ,:-(\|:-( ,;-)\|;-) ,:-P\|:-P ,=-O\|=-O ,:-\|:- ,:O\|:O ,B-)\|B-) ,:-$\|:-$ ,:-!\|:-! ,:-[\|:-[ ,O:-)\|O:-) ,:-\\\\\\\\\|:-\\\\\\\\ ,:\'(\|:\'( ,:-D\|:-D "</string>
		<string name="alternates_for_settings_slash">"\@drawable/sym_keyboard_settings\|\@integer/key_settings,/"</string>
		<string name="alternates_for_settings_at">"\@drawable/sym_keyboard_settings\|\@integer/key_settings,\@"</string>
		<string name="alternates_for_settings_comma">"\@drawable/sym_keyboard_settings\|\@integer/key_settings,\\,"</string>
		<string name="alternates_for_punctuation">":,/,&,(,),-,+,;,\@,\',\",\?,!,\\,"</string>
		<string name="keylabel_for_popular_domain">".com"</string>
		<!-- popular web domains for the locale - most popular, displayed on the keyboard -->

java/res/xml/kbd_key_styles.xml

+35 −10

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		<merge
		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
		>
		<!-- Functional key styles -->
		<!-- Base key style for the functional key -->
		<switch>
		<case
		latin:colorScheme="white"
		@@ -29,6 +29,37 @@
		<key-style
		latin:styleName="functionalKeyStyle"
		latin:isFunctional="true" />
		</case>
		<case
		latin:colorScheme="black"
		>
		<key-style
		latin:styleName="functionalKeyStyle" />
		</case>
		</switch>
		<!-- Base key style for the key which may have settings key as popup key -->
		<switch>
		<case
		latin:hasSettingsKey="true"
		>
		<key-style
		latin:styleName="settingsPopupStyle"
		latin:parentStyle="functionalKeyStyle" />
		</case>
		<!-- latin:hasSettingsKey="false" -->
		<default>
		<key-style
		latin:styleName="settingsPopupStyle"
		latin:keyHintIcon="@drawable/hint_popup"
		latin:popupCharacters="\@drawable/sym_keyboard_settings\|\@integer/key_settings"
		latin:parentStyle="functionalKeyStyle" />
		</default>
		</switch>
		<!-- Functional key styles -->
		<switch>
		<case
		latin:colorScheme="white"
		>
		<key-style
		latin:styleName="shiftKeyStyle"
		latin:code="@integer/key_shift"
		@@ -90,9 +121,7 @@
		latin:code="@integer/key_voice"
		latin:keyIcon="@drawable/sym_keyboard_mic"
		latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
		latin:keyHintIcon="@drawable/hint_popup"
		latin:popupCharacters="@string/alternates_for_mic"
		latin:parentStyle="functionalKeyStyle" />
		latin:parentStyle="settingsPopupStyle" />
		<!-- Note: This key style is not for functional tab key. This is used for the tab key
		which is laid out as normal letter key. -->
		<key-style
		@@ -104,8 +133,6 @@
		<case
		latin:colorScheme="black"
		>
		<key-style
		latin:styleName="functionalKeyStyle" />
		<key-style
		latin:styleName="shiftKeyStyle"
		latin:code="@integer/key_shift"
		@@ -167,9 +194,7 @@
		latin:code="@integer/key_voice"
		latin:keyIcon="@drawable/sym_bkeyboard_mic"
		latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
		latin:keyHintIcon="@drawable/hint_popup"
		latin:popupCharacters="@string/alternates_for_mic"
		latin:parentStyle="functionalKeyStyle" />
		latin:parentStyle="settingsPopupStyle" />
		<!-- Note: This key style is not for functional tab key. This is used for the tab key
		which is laid out as normal letter key. -->
		<key-style

java/res/xml/kbd_qwerty_f1.xml

+17 −66

Original line number	Diff line number	Diff line
		@@ -20,10 +20,6 @@

		<merge
		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
		>
		<switch>
		<case
		latin:hasSettingsKey="true"
		>
		<switch>
		<case
		@@ -31,14 +27,14 @@
		>
		<Key
		latin:keyLabel="/"
		latin:isFunctional="true" />
		latin:keyStyle="settingsPopupStyle" />
		</case>
		<case
		latin:mode="email"
		>
		<Key
		latin:keyLabel="\@"
		latin:isFunctional="true" />
		latin:keyStyle="settingsPopupStyle" />
		</case>
		<default>
		<switch>
		@@ -48,56 +44,11 @@
		<Key
		latin:keyStyle="micKeyStyle" />
		</case>
		<case
		latin:hasVoiceKey="false"
		>
		<Key
		latin:keyLabel=","
		latin:isFunctional="true" />
		</case>
		</switch>
		</default>
		</switch>
		</case>
		<!-- latin:hasSettingsKey="false" -->
		<!-- latin:hasVoiceKey="false" -->
		<default>
		<switch>
		<case
		latin:mode="url"
		>
		<Key
		latin:keyLabel="/"
		latin:keyHintIcon="@drawable/hint_popup"
		latin:popupCharacters="@string/alternates_for_settings_slash"
		latin:isFunctional="true" />
		</case>
		<case
		latin:mode="email"
		>
		<Key
		latin:keyLabel="\@"
		latin:keyHintIcon="@drawable/hint_popup"
		latin:popupCharacters="@string/alternates_for_settings_at"
		latin:isFunctional="true" />
		</case>
		<default>
		<switch>
		<case
		latin:hasVoiceKey="true"
		>
		<Key
		latin:keyStyle="micKeyStyle" />
		</case>
		<case
		latin:hasVoiceKey="false"
		>
		<Key
		latin:keyLabel=","
		latin:keyHintIcon="@drawable/hint_popup"
		latin:popupCharacters="@string/alternates_for_settings_comma"
		latin:isFunctional="true" />
		</case>
		</switch>
		latin:keyStyle="settingsPopupStyle" />
		</default>
		</switch>
		</default>

java/res/xml/kbd_symbols_f1.xml

+4 −7

Original line number	Diff line number	Diff line
		@@ -28,14 +28,11 @@
		<Key
		latin:keyStyle="micKeyStyle" />
		</case>
		<case
		latin:hasVoiceKey="false"
		>
		<!-- latin:hasVoiceKey="false" -->
		<default>
		<Key
		latin:keyLabel=","
		latin:keyHintIcon="@drawable/hint_popup"
		latin:popupCharacters="@string/alternates_for_settings_comma"
		latin:keyStyle="functionalKeyStyle" />
		</case>
		latin:keyStyle="settingsPopupStyle" />
		</default>
		</switch>
		</merge>