Merge "Optimize layout" (b690c039) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml-sw600dp/key_styles_common.xml

+0 −14

Original line number	Diff line number	Diff line
		@@ -21,20 +21,6 @@
		<merge
		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
		>
		<switch>
		<case
		latin:keyboardLayoutSetElement="alphabetManualShifted\|alphabetShiftLockShifted"
		>
		<key-style
		latin:styleName="hasShiftedLetterHintStyle"
		latin:keyLabelFlags="hasShiftedLetterHint\|shiftedLetterActivated" />
		</case>
		<default>
		<key-style
		latin:styleName="hasShiftedLetterHintStyle"
		latin:keyLabelFlags="hasShiftedLetterHint" />
		</default>
		</switch>
		<!-- Functional key styles -->
		<!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->
		<key-style

java/res/xml/key_space_30.xml

0 → 100644

+41 −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:languageSwitchKeyEnabled="true"
		>
		<Key
		latin:keyStyle="languageSwitchKeyStyle" />
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="20%p" />
		</case>
		<!-- languageSwitchKeyEnabled="false" -->
		<default>
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="30%p" />
		</default>
		</switch>
		</merge>

java/res/xml/key_styles_common.xml

+14 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,20 @@
		<merge
		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
		>
		<switch>
		<case
		latin:keyboardLayoutSetElement="alphabetManualShifted\|alphabetShiftLockShifted"
		>
		<key-style
		latin:styleName="hasShiftedLetterHintStyle"
		latin:keyLabelFlags="hasShiftedLetterHint\|shiftedLetterActivated" />
		</case>
		<default>
		<key-style
		latin:styleName="hasShiftedLetterHintStyle"
		latin:keyLabelFlags="hasShiftedLetterHint" />
		</default>
		</switch>
		<!-- Base key style for the key which may have settings or tab key as popup key. -->
		<include
		latin:keyboardLayout="@xml/key_styles_f1" />

java/res/xml-sw600dp/keys_comma_period.xml→java/res/xml/keys_comma_period.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -29,11 +29,13 @@
		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
		@@ -43,12 +45,14 @@
		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
		@@ -59,22 +63,26 @@
		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>
		<default>
		<Key
		latin:keyLabel="."
		latin:keyHintLabel="!text/keyhintlabel_for_tablet_period"
		latin:backgroundType="functional"
		latin:moreKeys="!text/more_keys_for_tablet_period" />
		<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" />
		</default>
		</switch>

java/res/xml/keys_less_greater.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -30,20 +30,24 @@
		<Key
		latin:keyLabel="«"
		latin:code="0x00BB"
		latin:backgroundType="functional"
		latin:moreKeys="!text/more_keys_for_less_than" />
		<Key
		latin:keyLabel="»"
		latin:code="0x00AB"
		latin:backgroundType="functional"
		latin:moreKeys="!text/more_keys_for_greater_than" />
		</case>
		<default>
		<Key
		latin:keyLabel="<"
		latin:code="!code/key_less_than"
		latin:backgroundType="functional"
		latin:moreKeys="!text/more_keys_for_less_than" />
		<Key
		latin:keyLabel=">"
		latin:code="!code/key_greater_than"
		latin:backgroundType="functional"
		latin:moreKeys="!text/more_keys_for_greater_than" />
		</default>
		</switch>