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

Commit 193913f1 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 0ee83f27: Merge change I8c9748c8 into eclair-mr2 

Merge commit '0ee83f27' into eclair-mr2-plus-aosp

* commit '0ee83f27':
  Input language switching. Bug: 2331173
parents 3a647464 0ee83f27

AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -24,5 +24,12 @@ 
                <action android:name="android.intent.action.MAIN"/>

            </intent-filter>

        </activity>



        <activity android:name="InputLanguageSelection"

                android:label="@string/language_selection_title">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

            </intent-filter>

        </activity>    

    </application>

</manifest>

res/drawable-hdpi/sym_keyboard_globe.png

0 → 100644
+2.04 KiB
Loading image diff...

res/values/keycodes.xml

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

<!--

/* 

**

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

*/

-->



<resources>

    <!-- Keycode for F1 (function) key. This one switches between language switch & comma/.com -->

    <integer name="key_f1">-102</integer>

</resources>

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -208,4 +208,7 @@ 
    <string name="popular_domain_3">".gov"</string>

    <!-- popular web domains for the locale - item 4, displayed in the popup -->

    <string name="popular_domain_4">".edu"</string>

    

    <!-- Title for input language selection screen -->

    <string name="language_selection_title">Select input languages</string>

</resources>

res/xml-de/kbd_qwerty.xml

+7 −9
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ 
                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters="_"

                android:keyWidth="20%p" android:keyEdgeFlags="left"/>

        <Key android:keyLabel="," android:keyWidth="10%p" />

        <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"

                android:keyWidth="10%p"/>

        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"

                android:iconPreview="@drawable/sym_keyboard_feedback_space"

                android:keyWidth="40%p" android:isRepeatable="true"/>
@@ -116,9 +117,7 @@ 
                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters="_"

                android:keyWidth="20%p" android:keyEdgeFlags="left"/>

        <Key android:keyLabel="@string/popular_domain_0"

                android:keyOutputText="@string/popular_domain_0"

                android:popupKeyboard="@xml/popup_domains"

        <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"

                android:keyWidth="15%p"/>

        <Key android:keyLabel="/" android:keyWidth="15%p"/>

        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -136,11 +135,9 @@ 
                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters="_"

                android:keyWidth="20%p" android:keyEdgeFlags="left"/>

        <Key android:keyLabel="\@" android:keyWidth="15%p"/>

        <Key android:keyLabel="@string/popular_domain_0"

                android:keyOutputText="@string/popular_domain_0"

                android:popupKeyboard="@xml/popup_domains"

        <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"

                android:keyWidth="15%p"/>

        <Key android:keyLabel="\@" android:keyWidth="15%p"/>

        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" 

                android:iconPreview="@drawable/sym_keyboard_feedback_space"

                android:keyWidth="15%p" android:isRepeatable="true"/>
@@ -156,7 +153,8 @@ 
                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters="_"

                android:keyWidth="20%p" android:keyEdgeFlags="left"/>

        <Key android:keyLabel="," android:keyWidth="10%p"/>

        <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"

                android:keyWidth="10%p"/>

        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"

                android:iconPreview="@drawable/sym_keyboard_feedback_space"

                android:keyWidth="40%p" android:isRepeatable="true"/>