Merge "Initial split QWERTY layout" (e143f5b1) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/values/attrs.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -483,6 +483,8 @@
		<attr name="localeCode" format="string" />
		<attr name="languageCode" format="string" />
		<attr name="countryCode" format="string" />
		<!-- Enable split keyboard layout. Disabled by default. -->
		<attr name="isSplitLayout" format="boolean" />
		</declare-styleable>

		<declare-styleable name="Keyboard_KeyStyle">

java/res/xml-sw600dp-land/key_space_3kw.xml

0 → 100644

+69 −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"
		>
		<!-- TODO: Consolidate the layout specification between protrait and landscape.
		Ideally just the keyWidth should be different -->
		<switch>
		<!-- fa: Perisan
		kn: Kannada
		ne: Nepali
		te: Telugu -->
		<case
		latin:languageCode="fa\|kn\|ne\|te"
		latin:languageSwitchKeyEnabled="true"
		>
		<Key
		latin:keyStyle="languageSwitchKeyStyle" />
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="7.0%p" />
		<Key
		latin:keyStyle="zwnjKeyStyle" />
		</case>
		<case
		latin:languageCode="fa\|kn\|ne\|te"
		latin:languageSwitchKeyEnabled="false"
		>
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="14.0%p" />
		<Key
		latin:keyStyle="zwnjKeyStyle" />
		</case>
		<case
		latin:languageSwitchKeyEnabled="true"
		>
		<Key
		latin:keyStyle="languageSwitchKeyStyle" />
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="14.0%p" />
		</case>
		<!-- languageSwitchKeyEnabled="false" -->
		<default>
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="21.0%p" />
		</default>
		</switch>
		</merge>

java/res/xml-sw600dp-land/row_qwerty4.xml

0 → 100644

+74 −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"
		>
		<switch>
		<!-- Split the 4th row for split layouts -->
		<case
		latin:isSplitLayout="true"
		>
		<Row
		latin:keyWidth="7.0%p"
		latin:backgroundType="functional"
		>
		<Key
		latin:keyStyle="toSymbolKeyStyle" />
		<include
		latin:keyboardLayout="@xml/key_comma" />
		<!-- Space key. -->
		<include
		latin:keyboardLayout="@xml/key_space_3kw"
		latin:backgroundType="normal" />
		<Spacer
		latin:keyWidth="28.0%p" />
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="21.0%p" />
		<include
		latin:keyboardLayout="@xml/key_period" />
		<include
		latin:keyboardLayout="@xml/key_emoji" />
		</Row>
		</case>
		<default>
		<Row
		latin:keyWidth="9.0%p"
		latin:backgroundType="functional"
		>
		<Key
		latin:keyStyle="toSymbolKeyStyle"
		latin:keyWidth="10.0%p" />
		<include
		latin:keyboardLayout="@xml/key_comma" />
		<!-- Space key. -->
		<include
		latin:keyXPos="19.0%p"
		latin:keyboardLayout="@xml/key_space_7kw"
		latin:backgroundType="normal" />
		<include
		latin:keyboardLayout="@xml/key_period" />
		<include
		latin:keyboardLayout="@xml/key_emoji" />
		</Row>
		</default>
		</switch>
		</merge>

java/res/xml-sw600dp-land/rows_qwerty.xml

0 → 100644

+133 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2011, 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" />
		<!-- First row -->
		<Row>
		<switch>
		<!-- Split keyboard layout for the first row -->
		<case
		latin:isSplitLayout="true"
		>
		<include
		latin:keyboardLayout="@xml/rowkeys_qwerty1_left5"
		latin:keyWidth="7.0%p" />
		<Spacer
		latin:keyWidth="20.0%p" />
		<include
		latin:keyboardLayout="@xml/rowkeys_qwerty1_right5"
		latin:keyWidth="7.0%p" />
		<Key
		latin:keyStyle="deleteKeyStyle"
		latin:keyWidth="10.0%p" />
		</case>
		<!-- Regular layout for the first row -->
		<default>
		<include
		latin:keyboardLayout="@xml/rowkeys_qwerty1"
		latin:keyWidth="9.0%p" />
		<Key
		latin:keyStyle="deleteKeyStyle"
		latin:keyWidth="fillRight" />
		</default>
		</switch>
		</Row>
		<!-- Second row -->
		<Row>
		<switch>
		<!-- Split keyboard layout for the second row -->
		<case
		latin:isSplitLayout="true"
		>
		<include
		latin:keyboardLayout="@xml/rowkeys_qwerty2_left5"
		latin:keyXPos="4.0%p"
		latin:keyWidth="7.0%p" />
		<Spacer
		latin:keyWidth="23.0%p" />
		<include
		latin:keyboardLayout="@xml/rowkeys_qwerty2_right4"
		latin:keyWidth="7.0%p" />
		<Key
		latin:keyStyle="enterKeyStyle"
		latin:keyWidth="10.0%p" />
		</case>
		<!-- Regular layout for the second row -->
		<default>
		<include
		latin:keyboardLayout="@xml/rowkeys_qwerty2"
		latin:keyXPos="4.5%p"
		latin:keyWidth="9.0%p" />
		<Key
		latin:keyStyle="enterKeyStyle"
		latin:keyWidth="fillRight" />
		</default>
		</switch>
		</Row>
		<!-- Third row -->
		<Row>
		<switch>
		<!-- Split keyboard layout for the third row -->
		<case
		latin:isSplitLayout="true"
		>
		<Key
		latin:keyStyle="shiftKeyStyle"
		latin:keyWidth="10.0%p" />
		<include
		latin:keyboardLayout="@xml/rowkeys_qwerty3_left4"
		latin:keyWidth="7.0%p" />
		<Spacer
		latin:keyWidth="17.0%p" />
		<include
		latin:keyboardLayout="@xml/rowkeys_qwerty3_right3"
		latin:keyWidth="7.0%p" />
		<include
		latin:keyboardLayout="@xml/keys_exclamation_question"
		latin:keyWidth="7.0%p" />
		<Key
		latin:keyStyle="shiftKeyStyle"
		latin:keyWidth="10.0%p" />
		</case>
		<!-- Regular layout for the third row -->
		<default>
		<Key
		latin:keyStyle="shiftKeyStyle"
		latin:keyWidth="10.0%p" />
		<include
		latin:keyboardLayout="@xml/rowkeys_qwerty3"
		latin:keyWidth="9.0%p" />
		<include
		latin:keyboardLayout="@xml/keys_exclamation_question"
		latin:keyWidth="9.0%p" />
		<Key
		latin:keyStyle="shiftKeyStyle"
		latin:keyWidth="fillRight" />
		</default>
		</switch>
		</Row>
		<!-- Fourth row -->
		<include
		latin:keyboardLayout="@xml/row_qwerty4" />
		</merge>

java/res/xml-sw600dp/key_space_3kw.xml

0 → 100644

+67 −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"
		>
		<switch>
		<!-- fa: Perisan
		kn: Kannada
		ne: Nepali
		te: Telugu -->
		<case
		latin:languageCode="fa\|kn\|ne\|te"
		latin:languageSwitchKeyEnabled="true"
		>
		<Key
		latin:keyStyle="languageSwitchKeyStyle" />
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="8.0%p" />
		<Key
		latin:keyStyle="zwnjKeyStyle" />
		</case>
		<case
		latin:languageCode="fa\|kn\|ne\|te"
		latin:languageSwitchKeyEnabled="false"
		>
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="16.0%p" />
		<Key
		latin:keyStyle="zwnjKeyStyle" />
		</case>
		<case
		latin:languageSwitchKeyEnabled="true"
		>
		<Key
		latin:keyStyle="languageSwitchKeyStyle" />
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="16.0%p" />
		</case>
		<!-- languageSwitchKeyEnabled="false" -->
		<default>
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="24.0%p" />
		</default>
		</switch>
		</merge>