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

Merge "Fix possible divided by zeror error"

main
Tadashi G. Takaoka 2013-06-24 08:44:17 +00:00 committed by Android (Google) Code Review
parent 33d4cdcb5b bafe4b8a4e
commit fadff6ada1
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,8 +279,14 @@ public final class MoreKeysKeyboard extends Keyboard {
mParentKey = parentKey; mParentKey = parentKey;
final int width, height; final int width, height;
// {@link KeyPreviewDrawParams#mPreviewVisibleWidth} should have been set at
// {@link MainKeyboardView#showKeyPreview(PointerTracker}, though there may be
// some chances that the value is zero. <code>width == 0</code> will cause
// zero-division error at
// {@link MoreKeysKeyboardParams#setParameters(int,int,int,int,int,int,boolean,int)}.
final boolean singleMoreKeyWithPreview = parentKeyboardView.isKeyPreviewPopupEnabled() final boolean singleMoreKeyWithPreview = parentKeyboardView.isKeyPreviewPopupEnabled()
&& !parentKey.noKeyPreview() && parentKey.mMoreKeys.length == 1; && !parentKey.noKeyPreview() && parentKey.mMoreKeys.length == 1
&& keyPreviewDrawParams.mPreviewVisibleWidth > 0;
if (singleMoreKeyWithPreview) { if (singleMoreKeyWithPreview) {
// Use pre-computed width and height if this more keys keyboard has only one key to // Use pre-computed width and height if this more keys keyboard has only one key to
// mitigate visual flicker between key preview and more keys keyboard. // mitigate visual flicker between key preview and more keys keyboard.
@ -291,22 +297,10 @@ public final class MoreKeysKeyboard extends Keyboard {
// adjusted with their bottom paddings deducted. // adjusted with their bottom paddings deducted.
width = keyPreviewDrawParams.mPreviewVisibleWidth; width = keyPreviewDrawParams.mPreviewVisibleWidth;
height = keyPreviewDrawParams.mPreviewVisibleHeight + mParams.mVerticalGap; height = keyPreviewDrawParams.mPreviewVisibleHeight + mParams.mVerticalGap;
// TODO: Remove this check.
if (width == 0) {
throw new IllegalArgumentException(
"Zero width key detected: " + parentKey + " in " + parentKeyboard.mId);
}
} else { } else {
width = getMaxKeyWidth(parentKeyboardView, parentKey, mParams.mDefaultKeyWidth, width = getMaxKeyWidth(parentKeyboardView, parentKey, mParams.mDefaultKeyWidth,
context.getResources()); context.getResources());
height = parentKeyboard.mMostCommonKeyHeight; height = parentKeyboard.mMostCommonKeyHeight;
// TODO: Remove this check.
if (width == 0) {
throw new IllegalArgumentException(
"Zero width calculated: " + parentKey
+ " moreKeys=" + java.util.Arrays.toString(parentKey.mMoreKeys)
+ " in " + parentKeyboard.mId);
}
} }
final int dividerWidth; final int dividerWidth;
if (parentKey.needsDividersInMoreKeys()) { if (parentKey.needsDividersInMoreKeys()) {