am 10aa8f12: am 9dcb764f: Fix "Show settings key" option on 7" device (DO NOT MERGE) (89dfebe7) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/values/attrs.xml

+11 −3

Original line number	Diff line number	Diff line
		@@ -178,9 +178,17 @@
		</attr>
		<attr name="webInput" format="boolean" />
		<attr name="passwordInput" format="boolean" />
		<attr name="hasSettingsKey" format="string" />
		<attr name="voiceKeyEnabled" format="string" />
		<attr name="hasVoiceKey" format="string" />
		<attr name="hasSettingsKey" format="boolean" />
		<!-- This should be aligned with KeyboardID.F2KEY_MODE_* -->
		<attr name="f2KeyMode" format="enum">
		<enum name="none" value="0" />
		<enum name="settings" value="1" />
		<enum name="shortcutIme" value="2" />
		<enum name="shortcutImeOrSettings" value="3" />
		</attr>
		<attr name="clobberSettingsKey" format="boolean" />
		<attr name="voiceKeyEnabled" format="boolean" />
		<attr name="hasVoiceKey" format="boolean" />
		<attr name="imeAction">
		<!-- This should be aligned with EditorInfo.IME_ACTION_* -->
		<flag name="actionUnspecified" value="0" />

java/res/xml-sw600dp/kbd_key_styles.xml

+41 −44

Original line number	Diff line number	Diff line
		@@ -37,6 +37,23 @@
		latin:styleName="functionalKeyStyle" />
		</case>
		</switch>
		<!-- Base key style for the key which may have settings key as popup key -->
		<switch>
		<case
		latin:clobberSettingsKey="true"
		>
		<key-style
		latin:styleName="settingsPopupStyle"
		latin:parentStyle="functionalKeyStyle" />
		</case>
		<default>
		<key-style
		latin:styleName="settingsPopupStyle"
		latin:keyHintIcon="@drawable/hint_popup_holo"
		latin:popupCharacters="\@drawable/sym_keyboard_settings_holo\|\@integer/key_settings"
		latin:parentStyle="functionalKeyStyle" />
		</default>
		</switch>
		<!-- Functional key styles -->
		<switch>
		<case
		@@ -78,28 +95,18 @@
		latin:keyHintIcon="@drawable/hint_popup_holo"
		latin:popupCharacters="@string/alternates_for_smiley"
		latin:maxPopupKeyboardColumn="5" />
		<switch>
		<case
		latin:voiceKeyEnabled="true"
		>
		<key-style
		latin:styleName="micOrSettingsKeyStyle"
		latin:styleName="micKeyStyle"
		latin:code="@integer/key_voice"
		latin:keyIcon="@drawable/sym_keyboard_voice_holo"
		latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
		latin:keyHintIcon="@drawable/hint_popup_holo"
		latin:popupCharacters="\@drawable/sym_keyboard_settings\|\@integer/key_settings"
		latin:parentStyle="functionalKeyStyle" />
		</case>
		<default>
		latin:parentStyle="settingsPopupStyle" />
		<key-style
		latin:styleName="micOrSettingsKeyStyle"
		latin:styleName="settingsKeyStyle"
		latin:code="@integer/key_settings"
		latin:keyIcon="@drawable/sym_keyboard_settings_holo"
		latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
		latin:parentStyle="functionalKeyStyle" />
		</default>
		</switch>
		</case>
		<case
		latin:colorScheme="black"
		@@ -140,28 +147,18 @@
		latin:keyHintIcon="@drawable/hint_popup_holo"
		latin:popupCharacters="@string/alternates_for_smiley"
		latin:maxPopupKeyboardColumn="5" />
		<switch>
		<case
		latin:voiceKeyEnabled="true"
		>
		<key-style
		latin:styleName="micOrSettingsKeyStyle"
		latin:styleName="micKeyStyle"
		latin:code="@integer/key_voice"
		latin:keyIcon="@drawable/sym_bkeyboard_mic"
		latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
		latin:keyHintIcon="@drawable/hint_popup_holo"
		latin:popupCharacters="\@drawable/sym_keyboard_settings\|\@integer/key_settings"
		latin:parentStyle="functionalKeyStyle" />
		</case>
		<default>
		latin:parentStyle="settingsPopupStyle" />
		<key-style
		latin:styleName="micOrSettingsKeyStyle"
		latin:styleName="settingsKeyStyle"
		latin:code="@integer/key_settings"
		latin:keyIcon="@drawable/sym_bkeyboard_settings"
		latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
		latin:parentStyle="functionalKeyStyle" />
		</default>
		</switch>
		</case>
		</switch>
		<key-style

java/res/xml-sw600dp/kbd_number.xml

+8 −9

Original line number	Diff line number	Diff line
		@@ -85,12 +85,11 @@
		latin:keyXPos="24.875%p" />
		<Key
		latin:keyStyle="num0KeyStyle" />
		<Spacer />
		<Key
		latin:keyStyle="micOrSettingsKeyStyle"
		<Spacer
		latin:keyXPos="-11.00%p"
		latin:keyWidth="0%p"
		latin:keyEdgeFlags="right" />
		latin:keyWidth="0dp" />
		<include
		latin:keyboardLayout="@xml/kbd_qwerty_f2" />
		</Row>
		</case>
		<!-- latin:passwordInput="false" -->
		@@ -182,11 +181,11 @@
		latin:keyLabel="0" />
		<Key
		latin:keyLabel="#" />
		<Key
		latin:keyStyle="micOrSettingsKeyStyle"
		<Spacer
		latin:keyXPos="-11.00%p"
		latin:keyWidth="-11.00%p"
		latin:keyEdgeFlags="right" />
		latin:keyWidth="0dp" />
		<include
		latin:keyboardLayout="@xml/kbd_qwerty_f2" />
		</Row>
		</default>
		</switch>

java/res/xml-sw600dp/kbd_phone.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -121,10 +121,10 @@
		latin:keyStyle="num0KeyStyle" />
		<Key
		latin:keyStyle="numPoundKeyStyle" />
		<Key
		latin:keyStyle="micOrSettingsKeyStyle"
		<Spacer
		latin:keyXPos="-11.00%p"
		latin:keyWidth="-11.00%p"
		latin:keyEdgeFlags="right" />
		latin:keyWidth="0dp" />
		<include
		latin:keyboardLayout="@xml/kbd_qwerty_f2" />
		</Row>
		</Keyboard>

java/res/xml-sw600dp/kbd_phone_symbols.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -131,10 +131,10 @@
		latin:keyStyle="num0KeyStyle" />
		<Key
		latin:keyStyle="numPoundKeyStyle" />
		<Key
		latin:keyStyle="micOrSettingsKeyStyle"
		<Spacer
		latin:keyXPos="-11.00%p"
		latin:keyWidth="-11.00%p"
		latin:keyEdgeFlags="right" />
		latin:keyWidth="0dp" />
		<include
		latin:keyboardLayout="@xml/kbd_qwerty_f2" />
		</Row>
		</Keyboard>