nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 383da922: am 664f11f2: am 0b288985: Merge "Fix emoji recent key behavior" 

* commit '383da922a64e33d72907ead6ac8771ad3b98856a':
  Fix emoji recent key behavior
main
Satoshi Kataoka 2013-10-09 20:33:30 -07:00 committed by Android Git Automerger
parent 2226498c64 383da922a6
commit b7c0e1a0ac
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
View File

@ -580,10 +580,18 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange
}
private void setCurrentCategoryId(final int categoryId, final boolean force) {
if (mEmojiCategory.getCurrentCategoryId() == categoryId && !force) {
final int oldCategoryId = mEmojiCategory.getCurrentCategoryId();
if (oldCategoryId == categoryId && !force) {
return;
}
if (oldCategoryId == CATEGORY_ID_RECENTS) {
// Needs to save pending updates for recent keys when we get out of the recents
// category because we don't want to move the recent emojis around while the user
// is in the recents category.
mEmojiKeyboardAdapter.flushPendingRecentKeys();
}
mEmojiCategory.setCurrentCategoryId(categoryId);
final int newTabId = mEmojiCategory.getTabIdFromCategoryId(categoryId);
final int newCategoryPageId = mEmojiCategory.getPageIdFromCategoryId(categoryId);
@ -612,8 +620,18 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange
mRecentsKeyboard = mEmojiCategory.getKeyboard(CATEGORY_ID_RECENTS, 0);
}
public void flushPendingRecentKeys() {
mRecentsKeyboard.flushPendingRecentKeys();
final KeyboardView recentKeyboardView =
mActiveKeyboardView.get(mEmojiCategory.getRecentTabId());
if (recentKeyboardView != null) {
recentKeyboardView.invalidateAllKeys();
}
}
public void addRecentKey(final Key key) {
if (mEmojiCategory.isInRecentTab()) {
mRecentsKeyboard.addPendingKey(key);
return;
}
mRecentsKeyboard.addKeyFirst(key);

21
java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java
View File

@ -39,6 +39,7 @@ public 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;
private final Object mLock = new Object();
private final SharedPreferences mPrefs;
private final int mLeftPadding;
@ -48,6 +49,7 @@ public class DynamicGridKeyboard extends Keyboard {
private final int mMaxKeyCount;
private final boolean mIsRecents;
private final ArrayDeque<GridKey> mGridKeys = CollectionUtils.newArrayDeque();
private final ArrayDeque<Key> mPendingKeys = CollectionUtils.newArrayDeque();
private Key[] mCachedGridKeys;
@ -74,6 +76,21 @@ public class DynamicGridKeyboard extends Keyboard {
throw new RuntimeException("Can't find template key: code=" + code);
}
public void addPendingKey(final Key usedKey) {
synchronized (mLock) {
mPendingKeys.addLast(usedKey);
}
}
public void flushPendingRecentKeys() {
synchronized (mLock) {
while (!mPendingKeys.isEmpty()) {
addKey(mPendingKeys.pollFirst(), true);
}
saveRecentKeys();
}
}
public void addKeyFirst(final Key usedKey) {
addKey(usedKey, true);
if (mIsRecents) {
@ -89,7 +106,7 @@ public class DynamicGridKeyboard extends Keyboard {
if (usedKey == null) {
return;
}
synchronized (mGridKeys) {
synchronized (mLock) {
mCachedGridKeys = null;
final GridKey key = new GridKey(usedKey);
while (mGridKeys.remove(key)) {
@ -167,7 +184,7 @@ public class DynamicGridKeyboard extends Keyboard {
@Override
public Key[] getKeys() {
synchronized (mGridKeys) {
synchronized (mLock) {
if (mCachedGridKeys != null) {
return mCachedGridKeys;
}