Merge "Make spacebar wider on phones" (416534d0) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml/kbd_key_styles.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -101,8 +101,8 @@
		<key-style
		latin:styleName="settingsKeyStyle"
		latin:code="@integer/key_settings"
		latin:keyIcon="@drawable/sym_keyboard_settings_holo"
		latin:iconPreview="@drawable/sym_keyboard_settings_holo"
		latin:keyIcon="@drawable/sym_keyboard_settings"
		latin:iconPreview="@drawable/sym_keyboard_settings"
		latin:parentStyle="functionalKeyStyle" />
		<key-style
		latin:styleName="spaceKeyStyle"

+72 −19

Original line number	Diff line number	Diff line
		@@ -20,7 +20,58 @@

		<merge
		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
		>
		<switch>
		<case
		latin:hasSettingsKey="true"
		>
		<switch>
		<case
		latin:mode="url"
		>
		<Key
		latin:keyLabel="/"
		latin:keyWidth="9.2%p"
		latin:keyStyle="settingsPopupStyle" />
		</case>
		<case
		latin:mode="email"
		>
		<Key
		latin:keyLabel="\@"
		latin:keyWidth="9.2%p"
		latin:keyStyle="settingsPopupStyle" />
		</case>
		<default>
		<switch>
		<case
		latin:hasVoiceKey="true"
		>
		<Key
		latin:keyStyle="micKeyStyle"
		latin:keyWidth="9.2%p" />
		</case>
		<!-- latin:hasVoiceKey="false" -->
		<case
		latin:navigateAction="true"
		>
		<Key
		latin:keyLabel="."
		latin:keyWidth="9.2%p"
		latin:keyStyle="settingsPopupStyle" />
		</case>
		<default>
		<Key
		latin:keyLabel=","
		latin:keyWidth="9.2%p"
		latin:keyStyle="settingsPopupStyle" />
		</default>
		</switch>
		</default>
		</switch>
		</case>
		<!-- hasSettingsKey="false" -->
		<default>
		<switch>
		<case
		latin:mode="url"
		@@ -60,4 +111,6 @@
		</switch>
		</default>
		</switch>
		</default>
		</switch>
		</merge>

+46 −24

Original line number	Diff line number	Diff line
		@@ -31,29 +31,49 @@
		>
		<Key
		latin:keyStyle="toSymbolKeyStyle"
		latin:keyWidth="15%p"
		latin:keyWidth="13.75%p"
		latin:keyEdgeFlags="left" />
		<Key
		latin:keyStyle="settingsKeyStyle" />
		latin:keyStyle="settingsKeyStyle"
		latin:keyWidth="9.2%p" />
		<include
		latin:keyboardLayout="@xml/kbd_qwerty_f1" />
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="30%p" />
		latin:keyWidth="35.83%p" />
		<switch>
		<case
		latin:navigateAction="true"
		>
		<Key
		latin:keyStyle="tabKeyStyle"
		latin:keyLabelOption="popupHint"
		latin:popupCharacters="@string/alternates_for_web_tab_punctuation"
		latin:keyWidth="9.2%p"
		latin:maxPopupKeyboardColumn="8" />
		</case>
		<default>
		<Key
		latin:keyLabel="."
		latin:keyLabelOption="popupHint"
		latin:popupCharacters="@string/alternates_for_punctuation"
		latin:keyWidth="9.2%p"
		latin:maxPopupKeyboardColumn="7"
		latin:keyStyle="functionalKeyStyle" />
		</default>
		</switch>
		</case>
		<!-- latin:hasSettingsKey="false" -->
		<default>
		<Key
		latin:keyStyle="toSymbolKeyStyle"
		latin:keyWidth="20%p"
		latin:keyWidth="15%p"
		latin:keyEdgeFlags="left" />
		<include
		latin:keyboardLayout="@xml/kbd_qwerty_f1" />
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="40%p" />
		</default>
		</switch>
		latin:keyWidth="50%p" />
		<switch>
		<case
		latin:navigateAction="true"
		@@ -73,6 +93,8 @@
		latin:keyStyle="functionalKeyStyle" />
		</default>
		</switch>
		</default>
		</switch>
		<switch>
		<case
		latin:mode="im"

+32 −7

Original line number	Diff line number	Diff line
		@@ -21,6 +21,29 @@
		<merge
		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
		>
		<switch>
		<case
		latin:hasSettingsKey="true"
		>
		<switch>
		<case
		latin:hasVoiceKey="true"
		>
		<Key
		latin:keyStyle="micKeyStyle"
		latin:keyWidth="9.2%p" />
		</case>
		<!-- latin:hasVoiceKey="false" -->
		<default>
		<Key
		latin:keyLabel=","
		latin:keyWidth="9.2%p"
		latin:keyStyle="settingsPopupStyle" />
		</default>
		</switch>
		</case>
		<!-- hasSettingsKey="false" -->
		<default>
		<switch>
		<case
		latin:hasVoiceKey="true"
		@@ -35,4 +58,6 @@
		latin:keyStyle="settingsPopupStyle" />
		</default>
		</switch>
		</default>
		</switch>
		</merge>

+19 −11

Original line number	Diff line number	Diff line
		@@ -31,35 +31,43 @@
		>
		<Key
		latin:keyStyle="toAlphaKeyStyle"
		latin:keyWidth="15%p"
		latin:keyWidth="13.75%p"
		latin:keyEdgeFlags="left" />
		<Key
		latin:keyStyle="settingsKeyStyle" />
		latin:keyStyle="settingsKeyStyle"
		latin:keyWidth="9.2%p" />
		<include
		latin:keyboardLayout="@xml/kbd_qwerty_f1" />
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="30%p" />
		latin:keyWidth="35.83%p" />
		<Key
		latin:keyLabel="."
		latin:keyLabelOption="popupHint"
		latin:popupCharacters="@string/alternates_for_punctuation"
		latin:keyWidth="9.2%p"
		latin:maxPopupKeyboardColumn="7"
		latin:keyStyle="functionalKeyStyle" />
		</case>
		<!-- latin:hasSettingsKey="false" -->
		<default>
		<Key
		latin:keyStyle="toAlphaKeyStyle"
		latin:keyWidth="20%p"
		latin:keyWidth="15%p"
		latin:keyEdgeFlags="left" />
		<include
		latin:keyboardLayout="@xml/kbd_symbols_f1" />
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="40%p" />
		</default>
		</switch>
		latin:keyWidth="50%p" />
		<Key
		latin:keyLabel="."
		latin:keyLabelOption="popupHint"
		latin:popupCharacters="@string/alternates_for_punctuation"
		latin:maxPopupKeyboardColumn="7"
		latin:keyStyle="functionalKeyStyle" />
		</default>
		</switch>
		<switch>
		<case
		latin:mode="im"