am 74b5291b: Merge "Remove language switch key from symbols and symbols shift keyboard"

* commit '74b5291b84cdafad90ef1d30ecf8a6c43040a6a1':
  Remove language switch key from symbols and symbols shift keyboard
main
Tadashi G. Takaoka 2014-01-05 22:21:26 -08:00 committed by Android Git Automerger
commit 77c9b8dd2f
5 changed files with 8 additions and 47 deletions

View File

@ -1,41 +0,0 @@
<?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>

View File

@ -21,6 +21,8 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
latin:keyboardLayout="@xml/key_space_3kw" />
<Key
latin:backgroundType="normal"
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30%p" />
</merge>

View File

@ -22,11 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
latin:keyLabel=","
latin:backgroundType="functional" />
latin:keyLabel="," />
<!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
<Key
latin:keyLabel="."
latin:moreKeys="&#x2026;"
latin:backgroundType="functional" />
latin:moreKeys="&#x2026;" />
</merge>

View File

@ -54,6 +54,7 @@
</Row>
<Row
latin:keyWidth="10%p"
latin:backgroundType="functional"
>
<Key
latin:keyStyle="toAlphaKeyStyle"

View File

@ -54,6 +54,7 @@
</Row>
<Row
latin:keyWidth="10%p"
latin:backgroundType="functional"
>
<Key
latin:keyStyle="toAlphaKeyStyle"