am fc51a820: Merge "Disable smooth scroll of Emoji pager"

* commit 'fc51a82079f4c9105f9d2f0f9e857dd75604c075':
  Disable smooth scroll of Emoji pager
main
Satoshi Kataoka 2013-09-16 20:54:16 -07:00 committed by Android Git Automerger
commit f5e0317701
1 changed files with 1 additions and 1 deletions

View File

@ -533,7 +533,7 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange
final int newCategoryPageId = mEmojiCategory.getPageIdFromCategoryId(categoryId); final int newCategoryPageId = mEmojiCategory.getPageIdFromCategoryId(categoryId);
if (force || mEmojiCategory.getCategoryIdAndPageIdFromPagePosition( if (force || mEmojiCategory.getCategoryIdAndPageIdFromPagePosition(
mEmojiPager.getCurrentItem()).first != categoryId) { mEmojiPager.getCurrentItem()).first != categoryId) {
mEmojiPager.setCurrentItem(newCategoryPageId, true /* smoothScroll */); mEmojiPager.setCurrentItem(newCategoryPageId, false /* smoothScroll */);
} }
if (force || mTabHost.getCurrentTab() != newTabId) { if (force || mTabHost.getCurrentTab() != newTabId) {
mTabHost.setCurrentTab(newTabId); mTabHost.setCurrentTab(newTabId);