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

am 358e485b: Experimental Extension keyboard 

Merge commit '358e485b14938fbcb5af5be75aa29f2b73674100' into eclair-mr2-plus-aosp

* commit '358e485b14938fbcb5af5be75aa29f2b73674100':
  Experimental Extension keyboard
main
Amith Yamasani 2009-12-09 15:53:05 -08:00 committed by Android Git Automerger
parent e10f56aeb1 358e485b14
commit bfd76d002c
4 changed files with 191 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
res/xml/kbd_extension.xml Executable file
View File

@ -0,0 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2008, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="10%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
>
<Row android:rowEdgeFlags="top">
<Key android:keyLabel="!" android:keyEdgeFlags="left"/>
<Key android:keyLabel="\@"/>
<Key android:keyLabel="\#"/>
<Key android:keyLabel="&amp;"/>
<Key android:keyLabel="-"/>
<Key android:keyLabel="\'"/>
<Key android:keyLabel=":"/>
<Key android:keyLabel="&quot;"/>
<Key android:keyLabel="/"/>
<Key android:keyLabel="\?" android:keyEdgeFlags="right"
/>
</Row>
<Row android:rowEdgeFlags="bottom">
<Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left"
/>
<Key android:codes="50" android:keyLabel="2"
/>
<Key android:codes="51" android:keyLabel="3"
/>
<Key android:codes="52" android:keyLabel="4"
/>
<Key android:codes="53" android:keyLabel="5"
/>
<Key android:codes="54" android:keyLabel="6"/>
<Key android:codes="55" android:keyLabel="7"
/>
<Key android:codes="56" android:keyLabel="8"/>
<Key android:codes="57" android:keyLabel="9"/>
<Key android:codes="48" android:keyLabel="0"
android:keyEdgeFlags="right"/>
</Row>
</Keyboard>

7
src/com/android/inputmethod/latin/KeyboardSwitcher.java
View File

@ -147,6 +147,13 @@ public class KeyboardSwitcher {
if (!mKeyboards.containsKey(id)) {
LatinKeyboard keyboard = new LatinKeyboard(
mContext, id.mXml, id.mMode);
if (id.mMode == KEYBOARDMODE_NORMAL
|| id.mMode == KEYBOARDMODE_URL
|| id.mMode == KEYBOARDMODE_IM
|| id.mMode == KEYBOARDMODE_EMAIL) {
keyboard.setExtension(R.xml.kbd_extension);
}
if (id.mEnableShiftLock) {
keyboard.enableShiftLock();
}

10
src/com/android/inputmethod/latin/LatinKeyboard.java
View File

@ -32,6 +32,8 @@ public class LatinKeyboard extends Keyboard {
private Key mShiftKey;
private Key mEnterKey;
private int mExtensionResId;
private static final int SHIFT_OFF = 0;
private static final int SHIFT_ON = 1;
private static final int SHIFT_LOCKED = 2;
@ -191,6 +193,14 @@ public class LatinKeyboard extends Keyboard {
}
}
public void setExtension(int resId) {
mExtensionResId = resId;
}
public int getExtension() {
return mExtensionResId;
}
static class LatinKey extends Keyboard.Key {
private boolean mShiftLockEnabled;

114
src/com/android/inputmethod/latin/LatinKeyboardView.java
View File

@ -16,6 +16,8 @@
package com.android.inputmethod.latin;
import java.util.List;
import android.content.Context;
import android.graphics.Canvas;
import android.inputmethodservice.Keyboard;
@ -25,9 +27,9 @@ import android.os.Handler;
import android.os.Message;
import android.os.SystemClock;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import java.util.List;
import android.widget.PopupWindow;
public class LatinKeyboardView extends KeyboardView {
@ -66,6 +68,114 @@ public class LatinKeyboardView extends KeyboardView {
}
}
private boolean mExtensionVisible;
private LatinKeyboardView mExtension;
private PopupWindow mExtensionPopup;
private boolean mFirstEvent;
@Override
public boolean onTouchEvent(MotionEvent me) {
if (((LatinKeyboard) getKeyboard()).getExtension() == 0) {
return super.onTouchEvent(me);
}
if (me.getY() < 0) {
if (mExtensionVisible) {
int action = me.getAction();
if (mFirstEvent) action = MotionEvent.ACTION_DOWN;
mFirstEvent = false;
MotionEvent translated = MotionEvent.obtain(me.getEventTime(), me.getEventTime(),
action,
me.getX(), me.getY() + mExtension.getHeight(), me.getMetaState());
boolean result = mExtension.onTouchEvent(translated);
translated.recycle();
if (me.getAction() == MotionEvent.ACTION_UP
|| me.getAction() == MotionEvent.ACTION_CANCEL) {
closeExtension();
}
return result;
} else {
if (openExtension()) {
MotionEvent cancel = MotionEvent.obtain(me.getDownTime(), me.getEventTime(),
MotionEvent.ACTION_CANCEL, me.getX() - 100, me.getY() - 100, 0);
super.onTouchEvent(cancel);
cancel.recycle();
if (mExtension.getHeight() > 0) {
MotionEvent translated = MotionEvent.obtain(me.getEventTime(),
me.getEventTime(),
MotionEvent.ACTION_DOWN,
me.getX(), me.getY() + mExtension.getHeight(),
me.getMetaState());
mExtension.onTouchEvent(translated);
translated.recycle();
} else {
mFirstEvent = true;
}
}
return true;
}
} else if (mExtensionVisible) {
closeExtension();
// Send a down event into the main keyboard first
MotionEvent down = MotionEvent.obtain(me.getEventTime(), me.getEventTime(),
MotionEvent.ACTION_DOWN,
me.getX(), me.getY(), me.getMetaState());
super.onTouchEvent(down);
down.recycle();
// Send the actual event
return super.onTouchEvent(me);
} else {
return super.onTouchEvent(me);
}
}
private boolean openExtension() {
if (((LatinKeyboard) getKeyboard()).getExtension() == 0) return false;
makePopupWindow();
mExtensionVisible = true;
return true;
}
private void makePopupWindow() {
if (mExtensionPopup == null) {
int[] windowLocation = new int[2];
mExtensionPopup = new PopupWindow(getContext());
mExtensionPopup.setBackgroundDrawable(null);
LayoutInflater li = (LayoutInflater) getContext().getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
mExtension = (LatinKeyboardView) li.inflate(R.layout.input, null);
mExtension.setOnKeyboardActionListener((LatinIME) getContext());
mExtension.setPopupParent(this);
mExtension.setPopupOffset(0, -windowLocation[1]);
Keyboard keyboard;
mExtension.setKeyboard(keyboard = new LatinKeyboard(getContext(),
((LatinKeyboard) getKeyboard()).getExtension()));
mExtensionPopup.setContentView(mExtension);
mExtensionPopup.setWidth(getWidth());
mExtensionPopup.setHeight(keyboard.getHeight());
getLocationInWindow(windowLocation);
// TODO: Fix the "- 30".
mExtension.setPopupOffset(0, -windowLocation[1] - 30);
mExtensionPopup.showAtLocation(this, 0, 0, -keyboard.getHeight()
+ windowLocation[1]);
} else {
mExtension.setVisibility(VISIBLE);
}
}
@Override
public void closing() {
super.closing();
if (mExtensionPopup != null && mExtensionPopup.isShowing()) {
mExtensionPopup.dismiss();
mExtensionPopup = null;
}
}
private void closeExtension() {
mExtension.setVisibility(INVISIBLE);
mExtension.closing();
mExtensionVisible = false;
}
/**************************** INSTRUMENTATION *******************************/