Skip to content
Snippets Groups Projects
  • Chieu Nguyen's avatar
    7674a653
    Unicode 8.0 emoji additions to Google Keyboard. · 7674a653
    Chieu Nguyen authored
    Squashed commit of the following:
    
        commit 8e86347b024e2460a17264fbcaa20cd6e5fd6018
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Tue Nov 10 11:29:44 2015 -0800
    
            Remove check for version code.
            This was unnecessary and caused multi-codepoint
            emoji to not show up on any device.
    
            Bug: 25369504
            Change-Id: Ia1e61c052444aaab824b18463c26b5a8066c65ed
    
        commit 1b924816665a3a2c48307dbdd1078f61dd3179f2
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Fri Nov 6 18:12:58 2015 -0800
    
            Fix Material icons for new tab.
    
            Bug: 25369504
            Bug: 16185905
            Change-Id: I873eb9e8fc1259ac94a974c04a80a4f0d005f9c2
    
        commit 956d5f86d2552d90d2c3240a85d5c1cddf05eda9
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Fri Nov 6 17:16:10 2015 -0800
    
            Remove extraneous TalkBack descriptions.
    
            Bug: 25369504
            Bug: 16185905
            Change-Id: Iec4f0f46cf9dda169c5827168ef207e56d619096
    
        commit 07357bdec69b5fc118c82401d59b61ad7b802c22
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Fri Nov 6 16:01:34 2015 -0800
    
        	Better checking of whether to display new emoji.
    
            Bug: 25369504
            Bug: 16185905
            Change-Id: I61f1b428e5a805f66eb4e9db346be8756fc84b8f
    
        commit 666a92f17034f5a1948e70f40226ed995c72d81f
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Fri Nov 6 12:54:53 2015 -0800
    
            Fix shading on emoji category icons.
    
            Bug: 25369504
            Bug: 16185905
    
            Change-Id: I217af3d97120e7910e9850de7ea331a461ae7e56
    
        commit 2712432c0e7a1b90ebb7ed6bde8f87eec7bf1094
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Thu Nov 5 19:06:57 2015 -0800
    
            Add new emoji categories to Holo Blue.
    
            Bug: 25369504
            Bug: 16185905
            Change-Id: Ie32af93e68e08b36a4a5861a06de511b2b190dca
    
        commit 04c79b1f53912b263d7f7eb8b71ac802ed960a8a
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Thu Nov 5 18:06:35 2015 -0800
    
            Fix default category, remove xxxhdpi Holo icons.
    
            Bug: 25369504
            Bug: 16185905
    
            Change-Id: I9bca795675297dceb93777d998e8f2935f7031a6
    
        commit 15c0b578343db2baa873096891a69305398eb830
        Merge: 77bc6fc 8604ce3
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Fri Nov 6 00:59:08 2015 +0000
    
            Merge changes  into jb-ub-latinimegoogle
    
        commit 77bc6fcfd760232757b5751993c0046f2a43626a
        Merge: b0380a0 8604ce3
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Fri Nov 6 00:59:04 2015 +0000
    
            Merge "Remove Kosovo from flags (no glyph)." into
            jb-ub-latinimegoogle
    
        commit b0380a0744647039278ad6648b7a1bc94eeab623
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Thu Nov 5 16:42:24 2015 -0800
    
            Add icons for new emoji categories.
    
            Bug: 25369504
            Bug: 16185905
            Change-Id: I1182e031994332b2e618406ad1cd467cb050766e
    
        commit 8604ce3a34b65598101cac37a3ed3e8087fe38ca
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Thu Nov 5 16:29:33 2015 -0800
    
            Remove Kosovo from flags (no glyph).
    
            Bug: 25369504
            Bug: 16185905
            Change-Id: I92c9ace19d3600cfa1f27678ada0cf45af42d8f5
    
        commit e0489eab47d3a6d138bfa00a668f02bcb473cf88
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Thu Nov 5 14:30:58 2015 -0800
    
            Update emoji set to blacklist non-color glyphs.
    
            Bug: 25369504
            Bug: 16185905
            Change-Id: I8b54217fa68da8ddaa1bbcd1845e0123ed106463
    
        commit 9ffdcdff058d6b44cab70e4fb0bb301e39699483
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Wed Nov 4 17:18:22 2015 -0800
    
            Add Unicode 8.0 emoji to emoji palette.
    
            Currently all emoji category tabs use the flower
            icon. A future CL will update these once the
            icons are finalized.
    
            If glyphs do not exist for new emoji, the old
            categories will be shown.
    
            Bug: 25369504
            Bug: 16185905
    
            Change-Id: Ie3759bfc4c8469a17f3205b45609ce6ef7510121
    
        commit 4a4a042072790b19048a14d2ddab655b1be31a6e
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Sun Nov 1 18:38:20 2015 -0800
    
            Add description strings for Unicode 8.0 new emoji.
    
            Bug: 16185905
            Bug: 25369504
    
            Change-Id: I6048609ace715a23db5f82d47fefe4868ccb3d17
    
    Change-Id: I30a043554b14531ab9cf89a1f663b6970d7d6863
    7674a653
    History
    Unicode 8.0 emoji additions to Google Keyboard.
    Chieu Nguyen authored
    Squashed commit of the following:
    
        commit 8e86347b024e2460a17264fbcaa20cd6e5fd6018
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Tue Nov 10 11:29:44 2015 -0800
    
            Remove check for version code.
            This was unnecessary and caused multi-codepoint
            emoji to not show up on any device.
    
            Bug: 25369504
            Change-Id: Ia1e61c052444aaab824b18463c26b5a8066c65ed
    
        commit 1b924816665a3a2c48307dbdd1078f61dd3179f2
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Fri Nov 6 18:12:58 2015 -0800
    
            Fix Material icons for new tab.
    
            Bug: 25369504
            Bug: 16185905
            Change-Id: I873eb9e8fc1259ac94a974c04a80a4f0d005f9c2
    
        commit 956d5f86d2552d90d2c3240a85d5c1cddf05eda9
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Fri Nov 6 17:16:10 2015 -0800
    
            Remove extraneous TalkBack descriptions.
    
            Bug: 25369504
            Bug: 16185905
            Change-Id: Iec4f0f46cf9dda169c5827168ef207e56d619096
    
        commit 07357bdec69b5fc118c82401d59b61ad7b802c22
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Fri Nov 6 16:01:34 2015 -0800
    
        	Better checking of whether to display new emoji.
    
            Bug: 25369504
            Bug: 16185905
            Change-Id: I61f1b428e5a805f66eb4e9db346be8756fc84b8f
    
        commit 666a92f17034f5a1948e70f40226ed995c72d81f
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Fri Nov 6 12:54:53 2015 -0800
    
            Fix shading on emoji category icons.
    
            Bug: 25369504
            Bug: 16185905
    
            Change-Id: I217af3d97120e7910e9850de7ea331a461ae7e56
    
        commit 2712432c0e7a1b90ebb7ed6bde8f87eec7bf1094
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Thu Nov 5 19:06:57 2015 -0800
    
            Add new emoji categories to Holo Blue.
    
            Bug: 25369504
            Bug: 16185905
            Change-Id: Ie32af93e68e08b36a4a5861a06de511b2b190dca
    
        commit 04c79b1f53912b263d7f7eb8b71ac802ed960a8a
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Thu Nov 5 18:06:35 2015 -0800
    
            Fix default category, remove xxxhdpi Holo icons.
    
            Bug: 25369504
            Bug: 16185905
    
            Change-Id: I9bca795675297dceb93777d998e8f2935f7031a6
    
        commit 15c0b578343db2baa873096891a69305398eb830
        Merge: 77bc6fc 8604ce3
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Fri Nov 6 00:59:08 2015 +0000
    
            Merge changes  into jb-ub-latinimegoogle
    
        commit 77bc6fcfd760232757b5751993c0046f2a43626a
        Merge: b0380a0 8604ce3
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Fri Nov 6 00:59:04 2015 +0000
    
            Merge "Remove Kosovo from flags (no glyph)." into
            jb-ub-latinimegoogle
    
        commit b0380a0744647039278ad6648b7a1bc94eeab623
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Thu Nov 5 16:42:24 2015 -0800
    
            Add icons for new emoji categories.
    
            Bug: 25369504
            Bug: 16185905
            Change-Id: I1182e031994332b2e618406ad1cd467cb050766e
    
        commit 8604ce3a34b65598101cac37a3ed3e8087fe38ca
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Thu Nov 5 16:29:33 2015 -0800
    
            Remove Kosovo from flags (no glyph).
    
            Bug: 25369504
            Bug: 16185905
            Change-Id: I92c9ace19d3600cfa1f27678ada0cf45af42d8f5
    
        commit e0489eab47d3a6d138bfa00a668f02bcb473cf88
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Thu Nov 5 14:30:58 2015 -0800
    
            Update emoji set to blacklist non-color glyphs.
    
            Bug: 25369504
            Bug: 16185905
            Change-Id: I8b54217fa68da8ddaa1bbcd1845e0123ed106463
    
        commit 9ffdcdff058d6b44cab70e4fb0bb301e39699483
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Wed Nov 4 17:18:22 2015 -0800
    
            Add Unicode 8.0 emoji to emoji palette.
    
            Currently all emoji category tabs use the flower
            icon. A future CL will update these once the
            icons are finalized.
    
            If glyphs do not exist for new emoji, the old
            categories will be shown.
    
            Bug: 25369504
            Bug: 16185905
    
            Change-Id: Ie3759bfc4c8469a17f3205b45609ce6ef7510121
    
        commit 4a4a042072790b19048a14d2ddab655b1be31a6e
        Author: Chieu Nguyen <cvnguyen@google.com>
        Date:   Sun Nov 1 18:38:20 2015 -0800
    
            Add description strings for Unicode 8.0 new emoji.
    
            Bug: 16185905
            Bug: 25369504
    
            Change-Id: I6048609ace715a23db5f82d47fefe4868ccb3d17
    
    Change-Id: I30a043554b14531ab9cf89a1f663b6970d7d6863
themes-klp.xml 8.42 KiB
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2015, 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 xmlns:android="http://schemas.android.com/apk/res/android">
    <style name="KeyboardTheme.KLP" parent="KeyboardIcons.Holo">
        <item name="inputViewStyle">@style/InputView.Holo</item>
        <item name="keyboardStyle">@style/Keyboard.KLP</item>
        <item name="keyboardViewStyle">@style/KeyboardView.KLP</item>
        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.KLP</item>
        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.KLP</item>
        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.KLP</item>
        <!-- Note: KLP theme uses the same style for both general more keys and action more keys. -->
        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.KLP</item>
        <item name="moreKeysKeyboardViewForActionStyle">@style/MoreKeysKeyboardView.KLP</item>
        <item name="suggestionStripViewStyle">@style/SuggestionStripView.KLP</item>
        <item name="suggestionWordStyle">@style/SuggestionWord.KLP</item>
    </style>
    <style
        name="Keyboard.KLP"
        parent="Keyboard"
    >
        <!-- This should be aligned with KeyboardTheme.THEME_ID_* -->
        <item name="themeId">KLP</item>
    </style>
    <style
        name="KeyboardView.KLP"
        parent="KeyboardView.Holo"
    >
        <item name="android:background">@drawable/keyboard_background_holo</item>
        <item name="keyBackground">@drawable/btn_keyboard_key_klp</item>
        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_klp</item>
        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_klp</item>
        <item name="keyTextColor">@color/key_text_color_holo</item>
        <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_holo</item>
        <item name="functionalTextColor">@color/key_text_color_holo</item>
        <item name="keyHintLetterColor">@color/key_hint_letter_color_holo</item>
        <item name="keyHintLabelColor">@color/key_hint_label_color_holo</item>
        <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_holo</item>
        <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_holo</item>
        <item name="keyPreviewTextColor">@color/key_text_color_holo</item>
    </style>
    <style
        name="MainKeyboardView.KLP"
        parent="KeyboardView.KLP"
    >
        <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_klp</item>
        <item name="keyPreviewHeight">@dimen/config_key_preview_height_holo</item>
        <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
        <item name="keyPreviewShowUpAnimator">@anim/key_preview_show_up_holo</item>
        <item name="keyPreviewDismissAnimator">@anim/key_preview_dismiss_holo</item>
        <item name="gestureFloatingPreviewTextColor">@color/highlight_color_klp</item>
        <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
        <item name="gestureTrailColor">@color/highlight_color_klp</item>
        <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_klp</item>
        <item name="languageOnSpacebarTextColor">@color/spacebar_text_color_holo</item>
        <item name="languageOnSpacebarTextShadowRadius">1.0</item>
        <item name="languageOnSpacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
    </style>
    <!-- Though {@link com.android.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
         {@link com.android.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
         delete button, need themed {@link com.android.inputmethod.keyboard.KeyboardView}
         attributes. -->
    <style
        name="EmojiPalettesView.KLP"
        parent="MainKeyboardView.KLP"
    >
        <item name="categoryIndicatorEnabled">true</item>
        <item name="categoryIndicatorDrawable">@drawable/emoji_category_tab_selected_klp</item>
        <item name="categoryIndicatorBackground">@drawable/emoji_category_tab_unselected_holo_dark</item>
        <item name="categoryPageIndicatorColor">@color/highlight_color_klp</item>
        <item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_holo</item>
        <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_holo_dark</item>
        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_people_holo_dark</item>
        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_objects_holo_dark</item>
        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_nature_holo_dark</item>
        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_holo_dark</item>
        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_holo_dark</item>
        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_holo_dark</item>
        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_holo_dark</item>
        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_holo_dark</item>
        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_holo_dark</item>
        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_holo_dark</item>
        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_holo_dark</item>
        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_holo_dark</item>
        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_holo_dark</item>
        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_holo_dark</item>
        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_holo_dark</item>
        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_holo_dark</item>
    </style>
    <style
        name="MoreKeysKeyboard.KLP"
        parent="Keyboard.KLP"
    >
        <item name="keyboardTopPadding">0%p</item>
        <item name="keyboardBottomPadding">0%p</item>
        <item name="horizontalGap">0%p</item>
        <item name="touchPositionCorrectionData">@null</item>
    </style>
    <style
        name="MoreKeysKeyboardView.KLP"
        parent="KeyboardView.KLP"
    >
        <item name="android:background">@drawable/keyboard_popup_panel_background_klp</item>
        <item name="keyBackground">@drawable/btn_keyboard_key_popup_klp</item>
        <item name="divider">@drawable/more_keys_divider</item>
        <item name="keyTypeface">normal</item>
        <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
    </style>
    <style
        name="SuggestionStripView.KLP"
        parent="KeyboardView.KLP"
    >
        <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>
        <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
        <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
        <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
        <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
        <item name="android:src">@drawable/suggestions_strip_divider_holo</item>
        <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
        <item name="colorValidTypedWord">@color/typed_word_color_klp</item>
        <item name="colorTypedWord">@color/typed_word_color_klp</item>
        <item name="colorAutoCorrect">@color/highlight_color_klp</item>
        <item name="colorSuggested">@color/suggested_word_color_klp</item>
        <item name="alphaObsoleted">70%</item>
    </style>
    <style
        name="SuggestionWord.KLP"
        parent="SuggestionWord"
    >
        <item name="android:background">@drawable/btn_suggestion_klp</item>
        <item name="android:textColor">@color/highlight_color_klp</item>
    </style>
</resources>