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

Remove unused argument from PopupPanel.showPanel

Browse source 
Change-Id: I726b98001042c8b874113ed964b7230fdd525abe
This commit is contained in:
Tadashi G. Takaoka 2011-06-23 21:14:55 +09:00
parent 9116bf18f9
commit 75d7fb6675
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
java/src/com/android/inputmethod/keyboard/KeyboardView.java
View file

@ -135,7 +135,6 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
private float mPreviewTextRatio; private float mPreviewTextRatio;
private int mPreviewTextSize; private int mPreviewTextSize;
private boolean mShowKeyPreviewPopup = true; private boolean mShowKeyPreviewPopup = true;
private int mKeyPreviewPopupDisplayedY = -1;
private final int mDelayBeforePreview; private final int mDelayBeforePreview;
private int mDelayAfterPreview; private int mDelayAfterPreview;
private ViewGroup mPreviewPlacer; private ViewGroup mPreviewPlacer;
@ -935,8 +934,6 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
// Dismiss key preview (in this case, slide language switcher) without any delay. // Dismiss key preview (in this case, slide language switcher) without any delay.
mPreviewText.setVisibility(View.INVISIBLE); mPreviewText.setVisibility(View.INVISIBLE);
} }
// Clear key preview display position.
mKeyPreviewPopupDisplayedY = -1;
} }
private void addKeyPreview(TextView keyPreview) { private void addKeyPreview(TextView keyPreview) {
@ -999,8 +996,6 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
getLocationInWindow(mCoordinates); getLocationInWindow(mCoordinates);
final int previewX = keyDrawX - (previewWidth - keyDrawWidth) / 2 + mCoordinates[0]; final int previewX = keyDrawX - (previewWidth - keyDrawWidth) / 2 + mCoordinates[0];
final int previewY = key.mY - previewHeight + mCoordinates[1] + mPreviewOffset; final int previewY = key.mY - previewHeight + mCoordinates[1] + mPreviewOffset;
// Record key preview position to display mini-keyboard later at the same position
mKeyPreviewPopupDisplayedY = previewY;
// Place the key preview. // Place the key preview.
// TODO: Adjust position of key previews which touch screen edges // TODO: Adjust position of key previews which touch screen edges
@ -1151,7 +1146,7 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
mPopupWindow.setClippingEnabled(false); mPopupWindow.setClippingEnabled(false);
} }
mPopupMiniKeyboardPanel = popupPanel; mPopupMiniKeyboardPanel = popupPanel;
popupPanel.showPanel(this, parentKey, tracker, mKeyPreviewPopupDisplayedY, mPopupWindow); popupPanel.showPanel(this, parentKey, tracker, mPopupWindow);
invalidateAllKeys(); invalidateAllKeys();
return true; return true;

2
java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java
View file

@ -67,7 +67,7 @@ public class PopupMiniKeyboardView extends KeyboardView implements PopupPanel {
@Override @Override
public void showPanel(KeyboardView parentKeyboardView, Key parentKey, public void showPanel(KeyboardView parentKeyboardView, Key parentKey,
PointerTracker tracker, int keyPreviewY, PopupWindow window) { PointerTracker tracker, PopupWindow window) {
final View container = (View)getParent(); final View container = (View)getParent();
final MiniKeyboard miniKeyboard = (MiniKeyboard)getKeyboard(); final MiniKeyboard miniKeyboard = (MiniKeyboard)getKeyboard();
final Keyboard parentKeyboard = parentKeyboardView.getKeyboard(); final Keyboard parentKeyboard = parentKeyboardView.getKeyboard();

4
java/src/com/android/inputmethod/keyboard/PopupPanel.java
View file

@ -27,12 +27,10 @@ public interface PopupPanel {
* @param parentKeyboardView the parent KeyboardView that has the parent key. * @param parentKeyboardView the parent KeyboardView that has the parent key.
* @param parentKey the parent key that is the source of this popup panel * @param parentKey the parent key that is the source of this popup panel
* @param tracker the pointer tracker that pressesd the parent key * @param tracker the pointer tracker that pressesd the parent key
* @param keyPreviewY the Y-coordinate of key preview
* @param window PopupWindow to be used to show this popup panel * @param window PopupWindow to be used to show this popup panel
*/ */
// TODO: Remove keyPreviewY from argument.
public void showPanel(KeyboardView parentKeyboardView, Key parentKey, public void showPanel(KeyboardView parentKeyboardView, Key parentKey,
PointerTracker tracker, int keyPreviewY, PopupWindow window); PointerTracker tracker, PopupWindow window);
/** /**
* Check if the pointer is in siding key input mode. * Check if the pointer is in siding key input mode.