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

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

Merge "Support Turkish keyboard"

parents 8a916d26 35f20916

java/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -289,6 +289,8 @@ 
    <string name="subtype_mode_sr_keyboard">Serbian Keyboard</string>

    <!-- Description for Swedish keyboard subtype [CHAR LIMIT=35] -->

    <string name="subtype_mode_sv_keyboard">Swedish Keyboard</string>

    <!-- Description for Turkish keyboard subtype [CHAR LIMIT=35] -->

    <string name="subtype_mode_tr_keyboard">Turkish Keyboard</string>

    <!-- Description for Afrikaans voice input subtype [CHAR LIMIT=35] -->

    <string name="subtype_mode_af_voice">Afrikaans Voice</string>

    <!-- Description for Czech voice input subtype [CHAR LIMIT=35] -->

java/res/xml-tr/kbd_qwerty.xml

0 → 100644
+27 −0
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.

*/

-->



<Keyboard

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

    latin:keyboardLocale="tr"

>

    <include

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

</Keyboard>

java/res/xml/method.xml

+6 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
<!-- The attributes in this XML file provide configuration information -->

<!-- for the Input Method Manager. -->



<!-- Keyboard: en_US, en_GB, ar, cs, da, de, es, es_US, fi, fr, fr_CA, fr_CH, hr, hu, it, iw, nb, nl, pl, pt, ru, sr, sv -->

<!-- Keyboard: en_US, en_GB, ar, cs, da, de, es, es_US, fi, fr, fr_CA, fr_CH, hr, hu, it, iw, nb, nl, pl, pt, ru, sr, sv, tr -->

<!-- Voice: af, cs, da, de, en, es, fr, it, ja, ko, nl, pl, pt, ru, tr, yue, zh, zu -->

<!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->

<!-- TODO: use <lang>_mic icon instead of a common mic icon. -->
@@ -185,6 +185,11 @@ 
            android:imeSubtypeLocale="sv"

            android:imeSubtypeMode="keyboard"

    />

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

            android:label="@string/subtype_mode_tr_keyboard"

            android:imeSubtypeLocale="tr"

            android:imeSubtypeMode="keyboard"

    />

<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->

<!--             android:label="@string/subtype_mode_af_voice" -->

<!--             android:imeSubtypeLocale="af" -->

java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public class LatinKeyboardView extends KeyboardView { 
                && keyboard.isShiftedOrShiftLocked()

                && !TextUtils.isEmpty(label) && label.length() < 3

                && Character.isLowerCase(label.charAt(0))) {

            return label.toString().toUpperCase();

            return label.toString().toUpperCase(keyboard.mId.mLocale);

        }

        return label;

    }

java/src/com/android/inputmethod/latin/LatinIME.java

+8 −6
Original line number Diff line number Diff line
@@ -1274,7 +1274,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
                clearSuggestions();

            }

        }

        KeyboardSwitcher switcher = mKeyboardSwitcher;

        final KeyboardSwitcher switcher = mKeyboardSwitcher;

        if (switcher.isShiftedOrShiftLocked()) {

            if (keyCodes == null || keyCodes[0] < Character.MIN_CODE_POINT

                    || keyCodes[0] > Character.MAX_CODE_POINT) {
@@ -1282,13 +1282,15 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
            }

            code = keyCodes[0];

            if (switcher.isAlphabetMode() && Character.isLowerCase(code)) {

                int upperCaseCode = Character.toUpperCase(code);

                if (upperCaseCode != code) {

                    code = upperCaseCode;

                // In some locales, such as Turkish, Character.toUpperCase() may return a wrong

                // character because it doesn't take care of locale.

                final String upperCaseString = new String(new int[] {code}, 0, 1)

                        .toUpperCase(mSubtypeSwitcher.getInputLocale());

                if (upperCaseString.codePointCount(0, upperCaseString.length()) == 1) {

                    code = upperCaseString.codePointAt(0);

                } else {

                    // Some keys, such as [eszett], have upper case as multi-characters.

                    String upperCase = new String(new int[] {code}, 0, 1).toUpperCase();

                    onTextInput(upperCase);

                    onTextInput(upperCaseString);

                    return;

                }

            }