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

Commit 7eb388c7 authored by Dan Zivkovic's avatar Dan Zivkovic Committed by Android Git Automerger
Browse files

am 174da5c3: Merge "Disable the Burmese keyboard." 

* commit '174da5c3':
  Disable the Burmese keyboard.
parents 6e9b4af3 174da5c3

java/res/values/attrs.xml

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ 
            <enum name="lao" value="10" />

            <enum name="latin" value="11" />

            <enum name="malayalam" value="12" />

            <enum name="myanmar" value="13" />

            <!-- Myanmar is disabled. <enum name="myanmar" value="13" /> -->

            <enum name="sinhala" value="14" />

            <enum name="tamil" value="15" />

            <enum name="telugu" value="16" />

java/res/xml-sw600dp/rows_myanmar.xml

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

<!--

/*

**

** Copyright 2014, 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">

    <include latin:keyboardLayout="@xml/key_styles_common" />

    <Row

        latin:keyWidth="9.0%p"

        latin:keyLabelFlags="fontNormal|autoXScale"

    >

        <include latin:keyboardLayout="@xml/rowkeys_myanmar1" />

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillRight" />

    </Row>

    <Row

        latin:keyWidth="9.0%p"

        latin:keyLabelFlags="fontNormal|autoXScale"

    >

        <include latin:keyboardLayout="@xml/rowkeys_myanmar2" />

    </Row>

    <Row

        latin:keyWidth="9.0%p"

        latin:keyLabelFlags="fontNormal|autoXScale"

    >

        <include latin:keyboardLayout="@xml/rowkeys_myanmar3" />

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillRight" />

    </Row>

    <Row

        latin:keyWidth="9.0%p"

        latin:keyLabelFlags="fontNormal|autoXScale"

    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="10.0%p" />

        <include latin:keyboardLayout="@xml/rowkeys_myanmar4" />

        <include latin:keyboardLayout="@xml/keys_exclamation_question" />

    </Row>

    <include latin:keyboardLayout="@xml/row_qwerty4" />

</merge>

java/res/xml/kbd_myanmar.xml

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

<!--

/*

**

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

*/

-->



<Keyboard

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

    latin:rowHeight="20%p"

    latin:verticalGap="@fraction/config_key_vertical_gap_5row"

    latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"

    latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"

    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"

>

    <include

        latin:keyboardLayout="@xml/rows_myanmar" />

</Keyboard>

java/res/xml/keyboard_layout_set_myanmar.xml

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

<!--

/*

**

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

*/

-->



<KeyboardLayoutSet

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

    <Feature

        latin:supportedScript="myanmar" />

    <Element

        latin:elementName="alphabet"

        latin:elementKeyboard="@xml/kbd_myanmar"

        latin:enableProximityCharsCorrection="true" />

    <Element

        latin:elementName="alphabetAutomaticShifted"

        latin:elementKeyboard="@xml/kbd_myanmar"

        latin:enableProximityCharsCorrection="true" />

    <!-- On these shifted alphabet layouts the proximity characters correction should be disabled

         because the letters on these layouts aren't the ones in different case of the above

         unshifted layouts. -->

    <Element

        latin:elementName="alphabetManualShifted"

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

    <Element

        latin:elementName="alphabetShiftLocked"

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

    <Element

        latin:elementName="alphabetShiftLockShifted"

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

    <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" />

</KeyboardLayoutSet>

java/res/xml/method.xml

+0 −11
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ 
    mn_MN: Mongolian (Mongolia)/mongolian

    mr_IN: Marathi (India)/marathi

    ms_MY: Malay (Malaysia)/qwerty

    my_MM: Myanmar (Myanmar)/myanmar # This is a preliminary keyboard layout.

    nb: Norwegian Bokmål/nordic

    ne_NP: Nepali (Nepal) Romanized/nepali_romanized

    ne_NP: Nepali (Nepal) Traditional/nepali_traditional
@@ -545,16 +544,6 @@ 
            android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"

            android:isAsciiCapable="true"

    />

    <!-- TODO: This Myanmar keyboard is a preliminary layout.

               This isn't based on the final specification. -->

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0xea266ea4"

            android:imeSubtypeLocale="my_MM"

            android:imeSubtypeMode="keyboard"

            android:imeSubtypeExtraValue="KeyboardLayoutSet=myanmar,EmojiCapable,CombiningRules=MyanmarReordering"

            android:isAsciiCapable="false"

    />

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0x3f12ee14"