am 74b5291b: Merge "Remove language switch key from symbols and symbols shift keyboard"
* commit '74b5291b84cdafad90ef1d30ecf8a6c43040a6a1': Remove language switch key from symbols and symbols shift keyboardmain
commit
77c9b8dd2f
|
@ -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>
|
|
|
@ -21,6 +21,8 @@
|
||||||
<merge
|
<merge
|
||||||
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
||||||
>
|
>
|
||||||
<include
|
<Key
|
||||||
latin:keyboardLayout="@xml/key_space_3kw" />
|
latin:backgroundType="normal"
|
||||||
|
latin:keyStyle="spaceKeyStyle"
|
||||||
|
latin:keyWidth="30%p" />
|
||||||
</merge>
|
</merge>
|
||||||
|
|
|
@ -22,11 +22,9 @@
|
||||||
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
||||||
>
|
>
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel=","
|
latin:keyLabel="," />
|
||||||
latin:backgroundType="functional" />
|
|
||||||
<!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
|
<!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="."
|
latin:keyLabel="."
|
||||||
latin:moreKeys="…"
|
latin:moreKeys="…" />
|
||||||
latin:backgroundType="functional" />
|
|
||||||
</merge>
|
</merge>
|
||||||
|
|
|
@ -54,6 +54,7 @@
|
||||||
</Row>
|
</Row>
|
||||||
<Row
|
<Row
|
||||||
latin:keyWidth="10%p"
|
latin:keyWidth="10%p"
|
||||||
|
latin:backgroundType="functional"
|
||||||
>
|
>
|
||||||
<Key
|
<Key
|
||||||
latin:keyStyle="toAlphaKeyStyle"
|
latin:keyStyle="toAlphaKeyStyle"
|
||||||
|
|
|
@ -54,6 +54,7 @@
|
||||||
</Row>
|
</Row>
|
||||||
<Row
|
<Row
|
||||||
latin:keyWidth="10%p"
|
latin:keyWidth="10%p"
|
||||||
|
latin:backgroundType="functional"
|
||||||
>
|
>
|
||||||
<Key
|
<Key
|
||||||
latin:keyStyle="toAlphaKeyStyle"
|
latin:keyStyle="toAlphaKeyStyle"
|
||||||
|
|
Loading…
Reference in New Issue