Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

LatinIME
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

6f6dd718

Commit 6f6dd718 authored 14 years ago by Kenny Root

Downloads
- Plain Diff

resolved conflicts for merge of 23d50bfb to master

Change-Id: Ia3fd85bd0c231f7b910b14caad38fa453a2336f6

parents e3b34081 23d50bfb

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

java/res/layout/input_trans.xml 0 additions, 32 deletions

java/res/layout/input_trans.xml
java/res/values/config.xml 4 additions, 0 deletions

java/res/values/config.xml
java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java 4 additions, 3 deletions

.../com/android/inputmethod/latin/LatinKeyboardBaseView.java
java/src/com/android/inputmethod/latin/PointerTracker.java 17 additions, 12 deletions

java/src/com/android/inputmethod/latin/PointerTracker.java

with 25 additions and 47 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment