Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc169c72 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Use keyboardSet extra value of subtype to specify layout type"

parents 0cedde12 11d9ee74

java/proguard.flags

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
  void setLogFileManager(...);

}



-keep class com.android.inputmethod.keyboard.KeyboardSet$Builder {

-keep class com.android.inputmethod.keyboard.KeyboardLayoutSet$Builder {

  void setTouchPositionCorrectionEnabled(...);

}

java/res/values/attrs.xml

+3 −3
Original line number Diff line number Diff line
@@ -350,8 +350,8 @@ 
    </declare-styleable>



    <declare-styleable name="Keyboard_Case">

        <!-- This should be aligned with KeyboardSet_Element's elementName. -->

        <attr name="keyboardSetElement" format="enum|string">

        <!-- This should be aligned with KeyboardLayoutSet_Element's elementName. -->

        <attr name="keyboardLayoutSetElement" format="enum|string">

            <enum name="alphabet" value="0" />

            <enum name="alphabetManualShifted" value="1" />

            <enum name="alphabetAutomaticShifted" value="2" />
@@ -403,7 +403,7 @@ 
        <attr name="parentStyle" format="string" />

    </declare-styleable>



    <declare-styleable name="KeyboardSet_Element">

    <declare-styleable name="KeyboardLayoutSet_Element">

        <!-- This should be aligned with KeyboardId.ELEMENT_* -->

        <attr name="elementName" format="enum">

            <enum name="alphabet" value="0" />

java/res/xml-ar/keyboard_set.xml

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2011, 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.

*/

-->



<KeyboardSet

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">

    <Element

        latin:elementName="alphabet"

        latin:elementKeyboard="@xml/kbd_arabic"

        latin:enableProximityCharsCorrection="true" />

    <Element

        latin:elementName="symbols"

        latin:elementKeyboard="@xml/kbd_symbols" />

    <Element

        latin:elementName="symbolsShifted"

        latin:elementKeyboard="@xml/kbd_symbols_shift" />

    <Element

        latin:elementName="phone"

        latin:elementKeyboard="@xml/kbd_phone" />

    <Element

        latin:elementName="phoneSymbols"

        latin:elementKeyboard="@xml/kbd_phone_symbols" />

    <Element

        latin:elementName="number"

        latin:elementKeyboard="@xml/kbd_number" />

</KeyboardSet>

java/res/xml-be/keyboard_set.xml

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2011, 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.

*/

-->



<KeyboardSet

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">

    <Element

        latin:elementName="alphabet"

        latin:elementKeyboard="@xml/kbd_east_slavic"

        latin:enableProximityCharsCorrection="true" />

    <Element

        latin:elementName="symbols"

        latin:elementKeyboard="@xml/kbd_symbols" />

    <Element

        latin:elementName="symbolsShifted"

        latin:elementKeyboard="@xml/kbd_symbols_shift" />

    <Element

        latin:elementName="phone"

        latin:elementKeyboard="@xml/kbd_phone" />

    <Element

        latin:elementName="phoneSymbols"

        latin:elementKeyboard="@xml/kbd_phone_symbols" />

    <Element

        latin:elementName="number"

        latin:elementKeyboard="@xml/kbd_number" />

</KeyboardSet>

java/res/xml-cs/keyboard_set.xml

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2011, 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.

*/

-->



<KeyboardSet

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">

    <Element

        latin:elementName="alphabet"

        latin:elementKeyboard="@xml/kbd_qwertz"

        latin:enableProximityCharsCorrection="true" />

    <Element

        latin:elementName="symbols"

        latin:elementKeyboard="@xml/kbd_symbols" />

    <Element

        latin:elementName="symbolsShifted"

        latin:elementKeyboard="@xml/kbd_symbols_shift" />

    <Element

        latin:elementName="phone"

        latin:elementKeyboard="@xml/kbd_phone" />

    <Element

        latin:elementName="phoneSymbols"

        latin:elementKeyboard="@xml/kbd_phone_symbols" />

    <Element

        latin:elementName="number"

        latin:elementKeyboard="@xml/kbd_number" />

</KeyboardSet>