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

am 6deea22c: am 31e152e3: am de65b7c0: Merge "Fix the position of emoji palette" 

* commit '6deea22cf1957cc2bb90eec762e0752aba194ad7':
  Fix the position of emoji palette
main
Satoshi Kataoka 2013-10-09 21:26:45 -07:00 committed by Android Git Automerger
parent 5e70e91e2c 6deea22cf1
commit 1a5e6a7446
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java
View File

@ -84,6 +84,7 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
private TabHost mTabHost; private TabHost mTabHost;
private ViewPager mEmojiPager; private ViewPager mEmojiPager;
private int mCurrentPagerPosition = 0;
private EmojiCategoryPageIndicatorView mEmojiCategoryPageIndicatorView; private EmojiCategoryPageIndicatorView mEmojiCategoryPageIndicatorView;
private KeyboardActionListener mKeyboardActionListener = KeyboardActionListener.EMPTY_LISTENER; private KeyboardActionListener mKeyboardActionListener = KeyboardActionListener.EMPTY_LISTENER;
@ -507,6 +508,7 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
setCurrentCategoryId(newPos.first /* categoryId */, false /* force */); setCurrentCategoryId(newPos.first /* categoryId */, false /* force */);
mEmojiCategory.setCurrentCategoryPageId(newPos.second /* categoryPageId */); mEmojiCategory.setCurrentCategoryPageId(newPos.second /* categoryPageId */);
updateEmojiCategoryPageIdView(); updateEmojiCategoryPageIdView();
mCurrentPagerPosition = position;
} }
@Override @Override
@ -569,15 +571,17 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
public void startEmojiPalettes() { public void startEmojiPalettes() {
if (DEBUG_PAGER) { if (DEBUG_PAGER) {
Log.d(TAG, "allocate emoji palettes memory"); Log.d(TAG, "allocate emoji palettes memory " + mCurrentPagerPosition);
} }
mEmojiPager.setAdapter(mEmojiPalettesAdapter); mEmojiPager.setAdapter(mEmojiPalettesAdapter);
mEmojiPager.setCurrentItem(mCurrentPagerPosition);
} }
public void stopEmojiPalettes() { public void stopEmojiPalettes() {
if (DEBUG_PAGER) { if (DEBUG_PAGER) {
Log.d(TAG, "deallocate emoji palettes memory"); Log.d(TAG, "deallocate emoji palettes memory");
} }
mEmojiPalettesAdapter.flushPendingRecentKeys();
mEmojiPager.setAdapter(null); mEmojiPager.setAdapter(null);
} }