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

Commit 2f5a933c authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Add GridRows tag to support emoji keyboard 

Bug: 6370846
Change-Id: Ia68284b2402e52d835040da900a51cca669add2f
parent c120199f

java/res/values-land/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -79,4 +79,7 @@ 
    <dimen name="gesture_floating_preview_text_offset">54dp</dimen>

    <dimen name="gesture_floating_preview_horizontal_padding">23dp</dimen>

    <dimen name="gesture_floating_preview_vertical_padding">15dp</dimen>



    <!-- Emoji keyboard -->

    <fraction name="emoji_keyboard_key_width">8.3333%p</fraction>

</resources>

java/res/values/attrs.xml

+5 −0
Original line number Diff line number Diff line
@@ -215,6 +215,11 @@ 
        <attr name="iconEmojiKey" format="reference" />

    </declare-styleable>



    <declare-styleable name="Keyboard_GridRows">

        <attr name="codesArray" format="reference" />

        <attr name="textsArray" format="reference" />

    </declare-styleable>



    <declare-styleable name="Keyboard_Key">

        <!-- The unicode value that this key outputs.

             Code value represented in hexadecimal prefixed with "0x" or code value reference using

java/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ 
    <dimen name="gesture_floating_preview_vertical_padding">16dp</dimen>

    <dimen name="gesture_floating_preview_round_radius">3dp</dimen>



    <!-- Emoji keyboard -->

    <fraction name="emoji_keyboard_key_width">14.2857%p</fraction>



    <!-- Inset used in Accessibility mode to avoid accidental key presses when a finger slides off the screen. -->

    <dimen name="accessibility_edge_slop">8dp</dimen>

java/res/xml/kbd_emoji_category1.xml

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

<!--

/*

**

** Copyright 2013, 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:keyWidth="@fraction/emoji_keyboard_key_width"

    latin:keyLetterSize="90%p"

>

    <GridRows

        latin:codesArray="@array/emoji_faces"

        latin:keyLabelFlags="fontNormal"

        latin:backgroundType="empty" />

</Keyboard>

java/res/xml/kbd_emoji_category2.xml

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

<!--

/*

**

** Copyright 2013, 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:keyWidth="@fraction/emoji_keyboard_key_width"

    latin:keyLetterSize="90%p"

>

    <GridRows

        latin:codesArray="@array/emoji_objects"

        latin:keyLabelFlags="fontNormal"

        latin:backgroundType="empty" />

</Keyboard>