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

Commit 368110b2 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Adds belgian layout (AZERTY)" into gingerbread

parents 40dcf567 c931bc08

java/res/xml-nl-rBE/kbd_qwerty.xml

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

<!--

/*

**

** Copyright 2008, 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:android="http://schemas.android.com/apk/res/android"

    android:keyWidth="10%p"

    android:horizontalGap="0px"

    android:verticalGap="@dimen/key_bottom_gap"

    android:keyHeight="@dimen/key_height"

>

    <Row

        android:rowEdgeFlags="top"

    >

        <Key

            android:keyLabel="a"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_a"

            android:keyEdgeFlags="left" />

        <Key

            android:keyLabel="z"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_z" />

        <Key

            android:keyLabel="e"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_e" />

        <Key

            android:keyLabel="r"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_r" />

        <Key

            android:keyLabel="t"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_t" />

        <Key

            android:keyLabel="y"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_y" />

        <Key

            android:keyLabel="u"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_u" />

        <Key

            android:keyLabel="i"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_i" />

        <Key

            android:keyLabel="o"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_o" />

        <Key

            android:keyLabel="p"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_p"

            android:keyEdgeFlags="right" />

    </Row>

    <Row>

        <Key

            android:keyLabel="q"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_q"

            android:keyEdgeFlags="left" />

        <Key

            android:keyLabel="s"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_s" />

        <Key

            android:keyLabel="d"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_d" />

        <Key

            android:keyLabel="f" />

        <Key

            android:keyLabel="g"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_g" />

        <Key

            android:keyLabel="h" />

        <Key

            android:keyLabel="j" />

        <Key

            android:keyLabel="k" />

        <Key

            android:keyLabel="l"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_l" />

        <Key

            android:keyLabel="m"

            android:keyEdgeFlags="right" />

    </Row>

    <Row>

        <Key

            android:codes="@integer/key_shift"

            android:keyIcon="@drawable/sym_keyboard_shift"

            android:iconPreview="@drawable/sym_keyboard_feedback_shift"

            android:keyWidth="15%p"

            android:isModifier="true"

            android:isSticky="true"

            android:keyEdgeFlags="left" />

        <Key

            android:keyLabel="w"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_w" />

        <Key

            android:keyLabel="x" />

        <Key

            android:keyLabel="c"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_c" />

        <Key

            android:keyLabel="v"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_v" />

        <Key

            android:keyLabel="b" />

        <Key

            android:keyLabel="n"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="@string/alternates_for_n" />

        <Key

            android:keyLabel="\'" />

        <Key

            android:codes="@integer/key_delete"

            android:keyIcon="@drawable/sym_keyboard_delete"

            android:iconPreview="@drawable/sym_keyboard_feedback_delete"

            android:keyWidth="15%p"

            android:isModifier="true"

            android:isRepeatable="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_normal"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="@integer/key_f1"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="40%p"

            android:isModifier="true" />

        <Key

            android:keyLabel="."

            android:keyIcon="@drawable/hint_popup"

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_url"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="@integer/key_f1"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="40%p"

            android:isModifier="true" />

        <Key

            android:keyLabel="."

            android:keyIcon="@drawable/hint_popup"

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_email"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="@integer/key_f1"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="40%p"

            android:isModifier="true" />

        <Key

            android:keyLabel="."

            android:keyIcon="@drawable/hint_popup"

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_im"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="@integer/key_f1"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="40%p"

            android:isModifier="true" />

        <Key

            android:keyLabel="."

            android:keyIcon="@drawable/hint_popup"

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:keyLabel=":-)"

            android:keyOutputText=":-) "

            android:keyIcon="@drawable/hint_popup"

            android:popupKeyboard="@xml/popup_smileys"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_webentry"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="@integer/key_f1"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_tab"

            android:keyIcon="@drawable/sym_keyboard_tab"

            android:iconPreview="@drawable/sym_keyboard_feedback_tab"

            android:isModifier="true" />

        <Key

            android:keyLabel="."

            android:keyIcon="@drawable/hint_popup"

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_normal_with_settings_key"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="@integer/key_settings"

            android:keyIcon="@drawable/sym_keyboard_settings"

            android:iconPreview="@drawable/sym_keyboard_feedback_settings"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_f1"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"

            android:isModifier="true" />

        <Key

            android:keyLabel="."

            android:keyIcon="@drawable/hint_popup"

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="25%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_url_with_settings_key"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="@integer/key_settings"

            android:keyIcon="@drawable/sym_keyboard_settings"

            android:iconPreview="@drawable/sym_keyboard_feedback_settings"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_f1"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"

            android:isModifier="true" />

        <Key

            android:keyLabel="."

            android:keyIcon="@drawable/hint_popup"

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="25%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_email_with_settings_key"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="@integer/key_settings"

            android:keyIcon="@drawable/sym_keyboard_settings"

            android:iconPreview="@drawable/sym_keyboard_feedback_settings"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_f1"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"

            android:isModifier="true" />

        <Key

            android:keyLabel="."

            android:keyIcon="@drawable/hint_popup"

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="25%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_im_with_settings_key"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="@integer/key_settings"

            android:keyIcon="@drawable/sym_keyboard_settings"

            android:iconPreview="@drawable/sym_keyboard_feedback_settings"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_f1"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"

            android:isModifier="true" />

        <Key

            android:keyLabel="."

            android:keyIcon="@drawable/hint_popup"

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:keyLabel=":-)"

            android:keyOutputText=":-) "

            android:keyIcon="@drawable/hint_popup"

            android:popupKeyboard="@xml/popup_smileys"

            android:keyWidth="25%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_webentry_with_settings_key"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="@integer/key_settings"

            android:keyIcon="@drawable/sym_keyboard_settings"

            android:iconPreview="@drawable/sym_keyboard_feedback_settings"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_f1"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_tab"

            android:keyIcon="@drawable/sym_keyboard_tab"

            android:iconPreview="@drawable/sym_keyboard_feedback_tab"

            android:isModifier="true" />

        <Key

            android:keyLabel="."

            android:keyIcon="@drawable/hint_popup"

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="15%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

</Keyboard>

java/res/xml-nl-rBE/kbd_qwerty_black.xml

0 → 100644
+457 −0

File added.

Preview size limit exceeded, changes collapsed.

java/res/xml-nl/kbd_qwerty.xml

0 → 100644
+504 −0

File added.

Preview size limit exceeded, changes collapsed.

java/res/xml-nl/kbd_qwerty_black.xml

0 → 100644
+446 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class InputLanguageSelection extends PreferenceActivity { 
    private static final String[] WHITELIST_LANGUAGES = {

        "ar", "bg", "cs", "da", "de", "el", "en_GB", "en_US", "es", "es_US", "fa",

        "fi", "fr", "fr_CA", "fr_CH", "it", "iw", "hr", "hu", "ka", "lt", "lv", "nb",

        "nl", "pl", "pt", "rm", "ro", "ru", "sk", "sr", "sv", "tr", "uk", "ur"

        "nl", "nl_BE", "pl", "pt", "rm", "ro", "ru", "sk", "sr", "sv", "tr", "uk", "ur"

    };



    private static boolean isWhitelisted(String lang) {