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

am 3ff72dd0: Consolidate 3 public methods of key preview into one

Browse source 
* commit '3ff72dd0daa9baaeb4d6b8ade59d65c1f0e8b34f':
  Consolidate 3 public methods of key preview into one
This commit is contained in:
Tadashi G. Takaoka 2014-06-19 00:36:55 +00:00 committed by Android Git Automerger
commit 5b1cc8d897
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
View file

@ -35,7 +35,6 @@ import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.inputmethod.InputMethodSubtype; import android.view.inputmethod.InputMethodSubtype;
import android.widget.TextView;
import com.android.inputmethod.accessibility.AccessibilityUtils; import com.android.inputmethod.accessibility.AccessibilityUtils;
import com.android.inputmethod.accessibility.MainKeyboardAccessibilityDelegate; import com.android.inputmethod.accessibility.MainKeyboardAccessibilityDelegate;
@ -461,12 +460,9 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
} }
locatePreviewPlacerView(); locatePreviewPlacerView();
final TextView previewTextView = mKeyPreviewChoreographer.getKeyPreviewTextView(
key, mDrawingPreviewPlacerView);
getLocationInWindow(mOriginCoords); getLocationInWindow(mOriginCoords);
mKeyPreviewChoreographer.placeKeyPreview(key, previewTextView, keyboard.mIconsSet, mKeyPreviewChoreographer.placeKeyPreviewAndShow(key, keyboard.mIconsSet, mKeyDrawParams,
mKeyDrawParams, getWidth(), mOriginCoords); getWidth(), mOriginCoords, mDrawingPreviewPlacerView, isHardwareAccelerated());
mKeyPreviewChoreographer.showKeyPreview(key, previewTextView, isHardwareAccelerated());
} }
// Implements {@link TimerHandler.Callbacks} method. // Implements {@link TimerHandler.Callbacks} method.

15
java/src/com/android/inputmethod/keyboard/internal/KeyPreviewChoreographer.java
View file

@ -57,7 +57,7 @@ public final class KeyPreviewChoreographer {
mParams = params; mParams = params;
} }
public TextView getKeyPreviewTextView(final Key key, final ViewGroup placerView) { private TextView getKeyPreviewTextView(final Key key, final ViewGroup placerView) {
TextView previewTextView = mShowingKeyPreviewTextViews.remove(key); TextView previewTextView = mShowingKeyPreviewTextViews.remove(key);
if (previewTextView != null) { if (previewTextView != null) {
return previewTextView; return previewTextView;
@ -134,7 +134,16 @@ public final class KeyPreviewChoreographer {
private static final int STATE_NORMAL = 0; private static final int STATE_NORMAL = 0;
private static final int STATE_HAS_MOREKEYS = 1; private static final int STATE_HAS_MOREKEYS = 1;
public void placeKeyPreview(final Key key, final TextView previewTextView, public void placeKeyPreviewAndShow(final Key key, final KeyboardIconsSet iconsSet,
final KeyDrawParams drawParams, final int keyboardViewWidth, final int[] keyboardOrigin,
final ViewGroup placerView, final boolean withAnimation) {
final TextView previewTextView = getKeyPreviewTextView(key, placerView);
placeKeyPreview(
key, previewTextView, iconsSet, drawParams, keyboardViewWidth, keyboardOrigin);
showKeyPreview(key, previewTextView, withAnimation);
}
private void placeKeyPreview(final Key key, final TextView previewTextView,
final KeyboardIconsSet iconsSet, final KeyDrawParams drawParams, final KeyboardIconsSet iconsSet, final KeyDrawParams drawParams,
final int keyboardViewWidth, final int[] originCoords) { final int keyboardViewWidth, final int[] originCoords) {
previewTextView.setTextColor(drawParams.mPreviewTextColor); previewTextView.setTextColor(drawParams.mPreviewTextColor);
@ -189,7 +198,7 @@ public final class KeyPreviewChoreographer {
previewTextView.setPivotY(previewHeight); previewTextView.setPivotY(previewHeight);
} }
public void showKeyPreview(final Key key, final TextView previewTextView, private void showKeyPreview(final Key key, final TextView previewTextView,
final boolean withAnimation) { final boolean withAnimation) {
if (!withAnimation) { if (!withAnimation) {
previewTextView.setVisibility(View.VISIBLE); previewTextView.setVisibility(View.VISIBLE);