am eaee1561: Optimize tablet layout (470e8339) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml-sw600dp/key_apostrophe.xml

deleted100644 → 0

+0 −49

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2012, 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:mode="email\|url"
		>
		<Key
		latin:keyLabel="-" />
		</case>
		<case
		latin:languageCode="fa"
		>
		<Key
		latin:keyLabel="!text/keylabel_for_apostrophe"
		latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
		latin:keyLabelFlags="hasPopupHint"
		latin:moreKeys="!text/more_keys_for_apostrophe"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		</case>
		<default>
		<Key
		latin:keyLabel="!text/keylabel_for_apostrophe"
		latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
		latin:moreKeys="!text/more_keys_for_apostrophe"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		</default>
		</switch>
		</merge>

java/res/xml-sw600dp/key_dash.xml

deleted100644 → 0

+0 −49

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2012, 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:mode="email\|url"
		>
		<Key
		latin:keyLabel="_" />
		</case>
		<case
		latin:languageCode="ar\|fa"
		>
		<Key
		latin:keyLabel="."
		latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
		latin:keyLabelFlags="hasPopupHint"
		latin:moreKeys="!text/more_keys_for_arabic_diacritics"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		</case>
		<default>
		<Key
		latin:keyLabel="-"
		latin:keyHintLabel="_"
		latin:moreKeys="_"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		</default>
		</switch>
		</merge>

java/res/xml-sw600dp/key_f1.xml

+1 −4

Original line number	Diff line number	Diff line
		@@ -53,10 +53,7 @@
		</case>
		<default>
		<Key
		latin:keyLabel="/"
		latin:keyHintLabel="\@"
		latin:moreKeys="\@"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		latin:keyLabel="/" />
		</default>
		</switch>
		</merge>

java/res/xml-sw600dp/key_f2.xml

+0 −9

Original line number	Diff line number	Diff line
		@@ -28,15 +28,6 @@
		<Key
		latin:keyStyle="comKeyStyle" />
		</case>
		<case
		latin:imeAction="actionSearch"
		>
		<Key
		latin:keyLabel=":"
		latin:keyHintLabel="+"
		latin:moreKeys="+"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		</case>
		<default>
		<Key
		latin:keyStyle="emojiKeyStyle" />

java/res/xml-sw600dp/keys_comma_period.xml

+44 −9

Original line number	Diff line number	Diff line
		@@ -23,24 +23,59 @@
		>
		<switch>
		<case
		latin:mode="email"
		latin:mode="email\|url"
		>
		<Key
		latin:keyLabel="," />
		latin:keyLabel="."
		latin:keyHintLabel="_"
		latin:moreKeys="_"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		<Key
		latin:keyLabel="." />
		latin:keyLabel=","
		latin:keyHintLabel="-"
		latin:moreKeys="-"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		</case>
		<default>
		<case
		latin:languageCode="ar"
		>
		<Key
		latin:keyLabel="!text/keylabel_for_tablet_comma"
		latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma"
		latin:moreKeys="!text/more_keys_for_tablet_comma"
		latin:keyLabel="!text/keylabel_for_apostrophe"
		latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
		latin:moreKeys="!text/more_keys_for_apostrophe"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		<Key
		latin:keyLabel="."
		latin:keyHintLabel="!text/keyhintlabel_for_tablet_period"
		latin:moreKeys="!text/more_keys_for_tablet_period"
		latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
		latin:keyLabelFlags="hasPopupHint"
		latin:moreKeys="!text/more_keys_for_arabic_diacritics"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		</case>
		<case
		latin:languageCode="fa"
		>
		<Key
		latin:keyLabel="!text/keylabel_for_apostrophe"
		latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
		latin:keyLabelFlags="hasPopupHint"
		latin:moreKeys="!text/more_keys_for_apostrophe"
		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:keyStyle="hasShiftedLetterHintStyle" />
		</case>
		<default>
		<Key
		latin:keyLabel="."
		latin:keyHintLabel="!text/keyhintlabel_for_tablet_period"
		latin:moreKeys="!text/more_keys_for_tablet_period" />
		<Key
		latin:keyLabel="!text/keylabel_for_tablet_comma"
		latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma"
		latin:moreKeys="!text/more_keys_for_tablet_comma" />
		</default>
		</switch>
		</merge>