am 72ce5fdc: Remove puctuationKeyStyle key style definition

* commit '72ce5fdcf6669dbc9248065037f0412e5ba69434':
  Remove puctuationKeyStyle key style definition
main
Tadashi G. Takaoka 2013-12-05 06:27:47 -08:00 committed by Android Git Automerger
commit 365f0d8381
3 changed files with 62 additions and 36 deletions

View File

@ -0,0 +1,60 @@
<?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:languageCode="ar|fa"
>
<Key
latin:keyLabel="."
latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
latin:moreKeys="!text/more_keys_for_arabic_diacritics"
latin:backgroundType="functional" />
</case>
<case
latin:languageCode="ne"
latin:keyboardLayoutSet="nepali_traditional"
>
<include
latin:keyboardLayout="@xml/key_nepali_traditional_period" />
</case>
<case
latin:languageCode="hy"
>
<!-- U+0589: "։" ARMENIAN FULL STOP -->
<Key
latin:keyLabel="&#x0589;"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_punctuation"
latin:backgroundType="functional" />
</case>
<default>
<Key
latin:keyLabel="."
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_punctuation"
latin:backgroundType="functional" />
</default>
</switch>
</merge>

View File

@ -182,12 +182,6 @@
latin:styleName="backFromMoreSymbolKeyStyle" latin:styleName="backFromMoreSymbolKeyStyle"
latin:code="!code/key_shift" latin:code="!code/key_shift"
latin:parentStyle="baseForToSymbolKeyStyle" /> latin:parentStyle="baseForToSymbolKeyStyle" />
<key-style
latin:styleName="punctuationKeyStyle"
latin:keyLabel="."
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_punctuation"
latin:backgroundType="functional" />
<key-style <key-style
latin:styleName="comKeyStyle" latin:styleName="comKeyStyle"
latin:keyLabel="!text/keylabel_for_popular_domain" latin:keyLabel="!text/keylabel_for_popular_domain"

View File

@ -32,36 +32,8 @@
<include <include
latin:keyXPos="25%p" latin:keyXPos="25%p"
latin:keyboardLayout="@xml/key_space_5kw" /> latin:keyboardLayout="@xml/key_space_5kw" />
<switch>
<case
latin:languageCode="ar|fa"
>
<Key
latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
latin:moreKeys="!text/more_keys_for_arabic_diacritics"
latin:keyStyle="punctuationKeyStyle" />
</case>
<case
latin:languageCode="ne"
latin:keyboardLayoutSet="nepali_traditional"
>
<include <include
latin:keyboardLayout="@xml/key_nepali_traditional_period" /> latin:keyboardLayout="@xml/key_period" />
</case>
<case
latin:languageCode="hy"
>
<!-- U+0589: "։" ARMENIAN FULL STOP -->
<Key
latin:keyLabel="&#x0589;"
latin:keyStyle="punctuationKeyStyle" />
</case>
<default>
<Key
latin:keyStyle="punctuationKeyStyle" />
</default>
</switch>
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />