diff options
author | 2013-09-13 07:39:09 +0000 | |
---|---|---|
committer | 2013-09-13 07:39:09 +0000 | |
commit | b9db10d62eec89259705c979ed2a294be6ded51c (patch) | |
tree | f195786364eea715b7d5b4572632052885a2fe1f /java/src | |
parent | 610f3eb4ec7f073c9ed058598b33e637e8bd6188 (diff) | |
parent | 2c011c697b70bb8c1ce519b1d38f099ad67a5c5e (diff) | |
download | latinime-b9db10d62eec89259705c979ed2a294be6ded51c.tar.gz latinime-b9db10d62eec89259705c979ed2a294be6ded51c.tar.xz latinime-b9db10d62eec89259705c979ed2a294be6ded51c.zip |
Merge "Refactor RecentsKeyboard"
Diffstat (limited to 'java/src')
-rw-r--r-- | java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java | 6 | ||||
-rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java (renamed from java/src/com/android/inputmethod/keyboard/internal/RecentsKeyboard.java) | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java index 6c6370490..9996a6d6a 100644 --- a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java @@ -37,7 +37,7 @@ import android.widget.TabHost; import android.widget.TabHost.OnTabChangeListener; import android.widget.TextView; -import com.android.inputmethod.keyboard.internal.RecentsKeyboard; +import com.android.inputmethod.keyboard.internal.DynamicGridKeyboard; import com.android.inputmethod.keyboard.internal.ScrollKeyboardView; import com.android.inputmethod.keyboard.internal.ScrollViewWithNotifier; import com.android.inputmethod.latin.Constants; @@ -376,7 +376,7 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange private static class EmojiKeyboardAdapter extends PagerAdapter { private final ScrollKeyboardView.OnKeyClickListener mListener; private final KeyboardLayoutSet mLayoutSet; - private final RecentsKeyboard mRecentsKeyboard; + private final DynamicGridKeyboard mRecentsKeyboard; private final SparseArray<ScrollKeyboardView> mActiveKeyboardView = CollectionUtils.newSparseArray(); private final EmojiCategory mEmojiCategory; @@ -388,7 +388,7 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange mEmojiCategory = emojiCategory; mListener = listener; mLayoutSet = layoutSet; - mRecentsKeyboard = new RecentsKeyboard( + mRecentsKeyboard = new DynamicGridKeyboard( layoutSet.getKeyboard(KeyboardId.ELEMENT_EMOJI_RECENTS)); } diff --git a/java/src/com/android/inputmethod/keyboard/internal/RecentsKeyboard.java b/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java index 629c60460..a226891b4 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/RecentsKeyboard.java +++ b/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java @@ -26,10 +26,10 @@ import java.util.ArrayDeque; import java.util.Random; /** - * This is a Keyboard class to host recently used keys. + * This is a Keyboard class where you can add keys dynamically shown in a grid layout */ // TODO: Save/restore recent keys from/to preferences. -public class RecentsKeyboard extends Keyboard { +public class DynamicGridKeyboard extends Keyboard { private static final int TEMPLATE_KEY_CODE_0 = 0x30; private static final int TEMPLATE_KEY_CODE_1 = 0x31; @@ -42,7 +42,7 @@ public class RecentsKeyboard extends Keyboard { private Key[] mCachedRecentKeys; - public RecentsKeyboard(final Keyboard templateKeyboard) { + public DynamicGridKeyboard(final Keyboard templateKeyboard) { super(templateKeyboard); final Key key0 = getTemplateKey(TEMPLATE_KEY_CODE_0); final Key key1 = getTemplateKey(TEMPLATE_KEY_CODE_1); |