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

e36af707

Commit e36af707 authored 12 years ago by Jean Chalard

Downloads
- Plain Diff

resolved conflicts for merge of b7e6bbae to master

Change-Id: Ic02809190721472d138532d2189328519117e042

parents 41a77f9e b7e6bbae

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

java/src/com/android/inputmethod/latin/InputAttributes.java 5 additions, 0 deletions

java/src/com/android/inputmethod/latin/InputAttributes.java
java/src/com/android/inputmethod/latin/InputTypeUtils.java 24 additions, 9 deletions

java/src/com/android/inputmethod/latin/InputTypeUtils.java
java/src/com/android/inputmethod/latin/LatinIME.java 3 additions, 1 deletion

java/src/com/android/inputmethod/latin/LatinIME.java
java/src/com/android/inputmethod/latin/SettingsValues.java 4 additions, 0 deletions

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

with 36 additions and 10 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