am 50704b7d: Merge "Turn off alpha of key popup preview"

* commit '50704b7d1cf3d5dc602d0efbe1d7a581b9b9e980':
  Turn off alpha of key popup preview
main
Satoshi Kataoka 2013-09-23 23:30:05 -07:00 committed by Android Git Automerger
commit c6c72b2269
1 changed files with 0 additions and 2 deletions

View File

@ -155,7 +155,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
private final SlidingKeyInputPreview mSlidingKeyInputPreview; private final SlidingKeyInputPreview mSlidingKeyInputPreview;
// Key preview // Key preview
private static final int PREVIEW_ALPHA = 240;
private final int mKeyPreviewLayoutId; private final int mKeyPreviewLayoutId;
private final int mKeyPreviewOffset; private final int mKeyPreviewOffset;
private final int mKeyPreviewHeight; private final int mKeyPreviewHeight;
@ -816,7 +815,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
if (background != null) { if (background != null) {
final int hasMoreKeys = (key.getMoreKeys() != null) ? STATE_HAS_MOREKEYS : STATE_NORMAL; final int hasMoreKeys = (key.getMoreKeys() != null) ? STATE_HAS_MOREKEYS : STATE_NORMAL;
background.setState(KEY_PREVIEW_BACKGROUND_STATE_TABLE[statePosition][hasMoreKeys]); background.setState(KEY_PREVIEW_BACKGROUND_STATE_TABLE[statePosition][hasMoreKeys]);
background.setAlpha(PREVIEW_ALPHA);
} }
ViewLayoutUtils.placeViewAt( ViewLayoutUtils.placeViewAt(
previewText, previewX, previewY, previewWidth, previewHeight); previewText, previewX, previewY, previewWidth, previewHeight);