summaryrefslogtreecommitdiff
path: root/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-09-16 09:31:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-16 09:31:47 +0000
commitc65f6c3001ca0371a6265f37a00e3f02ff23b169 (patch)
tree3cc36610350a0b5ab2124d20cfb1b9e9a360ad74 /java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java
parent187dd85a4047a50b4f4f147d08c090983671bd1e (diff)
parent5dfbc8af2439152ca6b6759309aced5bb879b518 (diff)
Merge "Split Emoji categories fitting the pager"
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java')
-rw-r--r--java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java b/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java
index 22708975a..1e5ee59f0 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java
@@ -41,7 +41,7 @@ public class DynamicGridKeyboard extends Keyboard {
private Key[] mCachedGridKeys;
- public DynamicGridKeyboard(final Keyboard templateKeyboard, final int maxRows) {
+ public DynamicGridKeyboard(final Keyboard templateKeyboard, final int maxKeyCount) {
super(templateKeyboard);
final Key key0 = getTemplateKey(TEMPLATE_KEY_CODE_0);
final Key key1 = getTemplateKey(TEMPLATE_KEY_CODE_1);
@@ -49,7 +49,7 @@ public class DynamicGridKeyboard extends Keyboard {
mHorizontalStep = Math.abs(key1.getX() - key0.getX());
mVerticalStep = key0.getHeight() + mVerticalGap;
mColumnsNum = mBaseWidth / mHorizontalStep;
- mMaxKeyCount = mColumnsNum * maxRows;
+ mMaxKeyCount = maxKeyCount;
}
private Key getTemplateKey(final int code) {