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

Commit 9f4d62cc authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Create com.android.inputmethod.keyboard.emoji package 

Change-Id: Idd12c2fa4f5add7bb50bd7349ff9a74fffe82cfd
parent 71f4c6b8

java/res/layout/emoji_keyboard_page.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
*/

-->



<com.android.inputmethod.keyboard.internal.EmojiPageKeyboardView

<com.android.inputmethod.keyboard.emoji.EmojiPageKeyboardView

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

    android:id="@+id/emoji_keyboard_page"

    android:layoutDirection="ltr"

java/res/layout/emoji_palettes_view.xml

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
*/

-->



<com.android.inputmethod.keyboard.EmojiPalettesView

<com.android.inputmethod.keyboard.emoji.EmojiPalettesView

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

    android:id="@+id/emoji_keyboard_view"

    android:orientation="vertical"
@@ -78,7 +78,7 @@ 
        android:id="@+id/emoji_keyboard_pager"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" />

    <com.android.inputmethod.keyboard.EmojiCategoryPageIndicatorView

    <com.android.inputmethod.keyboard.emoji.EmojiCategoryPageIndicatorView

        android:id="@+id/emoji_category_page_id_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"
@@ -109,4 +109,4 @@ 
            android:gravity="center"

            android:layout_height="match_parent" />

    </LinearLayout>

</com.android.inputmethod.keyboard.EmojiPalettesView>
 
</com.android.inputmethod.keyboard.emoji.EmojiPalettesView>

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

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.view.inputmethod.EditorInfo; 


import com.android.inputmethod.compat.InputMethodServiceCompatUtils;

import com.android.inputmethod.keyboard.KeyboardLayoutSet.KeyboardLayoutSetException;

import com.android.inputmethod.keyboard.emoji.EmojiPalettesView;

import com.android.inputmethod.keyboard.internal.KeyboardState;

import com.android.inputmethod.keyboard.internal.KeyboardTextsSet;

import com.android.inputmethod.latin.InputView;

java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java→java/src/com/android/inputmethod/keyboard/emoji/DynamicGridKeyboard.java

+2 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.inputmethod.keyboard.internal;

package com.android.inputmethod.keyboard.emoji;



import android.content.SharedPreferences;

import android.text.TextUtils;
@@ -35,8 +35,7 @@ import java.util.List; 
/**

 * This is a Keyboard class where you can add keys dynamically shown in a grid layout

 */

// TODO: Move this class to com.android.inputmethod.emoji package.

public class DynamicGridKeyboard extends Keyboard {

final class DynamicGridKeyboard extends Keyboard {

    private static final String TAG = DynamicGridKeyboard.class.getSimpleName();

    private static final int TEMPLATE_KEY_CODE_0 = 0x30;

    private static final int TEMPLATE_KEY_CODE_1 = 0x31;

java/src/com/android/inputmethod/keyboard/internal/EmojiCategory.java→java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java

+2 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.inputmethod.keyboard.internal;

package com.android.inputmethod.keyboard.emoji;



import android.content.SharedPreferences;

import android.content.res.Resources;
@@ -39,8 +39,7 @@ import java.util.HashMap; 
import java.util.List;

import java.util.concurrent.ConcurrentHashMap;



// TODO: Move this class to com.android.inputmethod.emoji package.

public final class EmojiCategory {

final class EmojiCategory {

    private final String TAG = EmojiCategory.class.getSimpleName();



    private static final int ID_UNSPECIFIED = -1;