b3e66833d5
Merge "Import translations. DO NOT MERGE"
2012-11-09 16:27:53 -08:00
53bd25bf3a
Import translations. DO NOT MERGE
...
Change-Id: Ibf5dc194560d09cc1945c5478197b9170c176492
Auto-generated-cl: translation import
2012-11-09 12:45:34 -08:00
ef2b4082fb
am 21177c1a: Remove gesture typing settings when disabled by configuration
...
* commit '21177c1afed4c04f436acbd1116568051167c899':
Remove gesture typing settings when disabled by configuration
2012-11-09 08:03:23 -08:00
21177c1afe
Remove gesture typing settings when disabled by configuration
...
Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
2012-11-09 07:58:27 -08:00
01d47b8096
Fix a logic flaw.
...
This test is seriously wrong : although we do have a method that
does exactly the right thing, this looks at a very specific, unrelated
variable state in hope it happens to be set only in the relevant
cases by the play of logic.
I don't think this changes anything concretely, as the assumption
was probably true in the practice ; still, this code is very hard to
read and prone to unexpected breakage.
Change-Id: I77ab576f90762429fcc752df31ed30e1c81871dc
2012-11-09 19:16:37 +09:00
c026b578dd
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-09 15:13:14 +09:00
710d06cea9
Suppress dictionary pack support when IS_EXPERIMENTAL is true
...
Change-Id: If8813cb989c1fa8744a3bf36e8514ced3c8f46a3
2012-11-09 15:03:31 +09:00
c43ff6f66c
Remove gesture typing settings when disabled by configuration
...
Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
2012-11-09 12:44:40 +09:00
0b2aa7f63b
am 9185a6c2: (-s ours) am a8ec322b: am bc43e3f2: Reconcile with jb-mr1-release - do not merge
...
* commit '9185a6c2c315a8db537edc5d1bf582199d157bb2':
2012-11-08 06:32:15 -08:00
9185a6c2c3
am a8ec322b: am bc43e3f2: Reconcile with jb-mr1-release - do not merge
...
* commit 'a8ec322b1a24111aa3e7e533d00586536212ff7b':
2012-11-08 06:27:09 -08:00
43f579e9f6
am 4eef5101: am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
...
* commit '4eef51016adc4e103fa65d944a0ab31527ddced8':
Reset the IME if requested by the app.
2012-11-08 06:22:02 -08:00
4eef51016a
am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
...
* commit 'aa5d6fe05ce45e36b732a3abc849508cd8279257':
Reset the IME if requested by the app.
2012-11-08 06:12:57 -08:00
5b1037fa94
Fix a bug in the diff tool
...
Fix reporting of removed attributes multiple times instead
of just one in some cases. Also, report the frequency of
the removed bigram in the same cases.
Change-Id: I1455fa7553fcebc3005c222bf5aa9afcf1678c31
2012-11-08 11:57:45 +09:00
a8ec322b1a
am bc43e3f2: Reconcile with jb-mr1-release - do not merge
...
* commit 'bc43e3f29060252d2a08b4e976bdb2ca50438623':
2012-11-07 10:24:23 -08:00
bc43e3f290
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I105d8e6a795dd5b38d42051196581896e7ea4f30
2012-11-07 10:20:18 -08:00
d957ded1d5
Merge "Import translations. DO NOT MERGE"
2012-11-07 10:06:29 -08:00
cfddbde41a
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-07 16:20:20 +09:00
be07aad4e9
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-06 18:04:26 -08:00
8df57deb05
Import translations. DO NOT MERGE
...
Change-Id: I97ceec5680a8ba9f27d5f62a7573555590268376
Auto-generated-cl: translation import
2012-11-06 16:54:45 -08:00
f775bf3b6f
Fix a build error in x86 builds
...
Change-Id: I64a7c35d01540eb63f09cacddaab03f95729ed02
2012-11-07 07:52:34 +09:00
aa5d6fe05c
am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
...
* commit '9cc22c45ec04f3b1772631e1ef18103dc55c2a0b':
Reset the IME if requested by the app.
2012-11-06 14:29:45 -08:00
9cc22c45ec
am 5d2556b9: Reset the IME if requested by the app.
...
* commit '5d2556b93286f5f1d7d829b586b84a8b7ae55743':
Reset the IME if requested by the app.
2012-11-06 14:27:24 -08:00
796050d144
am ef51f33e: (-s ours) am 4d095547: am 202c3a5f: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'ef51f33e544577c8fbc802a5623bef87d97473b8':
2012-11-06 12:34:08 -08:00
ef51f33e54
am 4d095547: am 202c3a5f: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '4d09554794ace67b01a6674c36edd5495b32cc38':
2012-11-06 12:30:07 -08:00
4d09554794
am 202c3a5f: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '202c3a5f32e20939a3dff24b7e2f047e47b29e17':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Build LatinIME with NDK r8
2012-11-06 12:24:06 -08:00
202c3a5f32
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I355e91c06f0958f1baec5923324dcbcdf408d3f2
2012-11-06 12:18:48 -08:00
5d2556b932
Reset the IME if requested by the app.
...
Specifically, reset the KeyboardState to the main Alphabet layout in
LatinIME.onStartInputViewInternal() if a keyboard layout set doesn't get
reloaded in the method.
Please note TextView.setText() calls up resetInput(), then the IME should
reset with it.
bug: 7482086
Note that bug: 6851364 needs to be revisited.
Change-Id: I5d448c10963d3dd952dd13cb587085ec7b014e69
2012-11-07 01:09:26 +09:00
6962a566f4
Resolve merge conflict
...
Change-Id: I96c87f7a4e4d34357d3d4c772eb3782c171bb4c0
2012-11-06 13:52:52 +09:00
9c739939a3
Add missing res dir
...
Change-Id: I50e79bbb1f2eab33c7e5a76086bbe41f7e757ada
2012-11-06 13:49:17 +09:00
555e15a96a
Merge remote-tracking branch 'goog/master' into mergescriptpackage
...
Conflicts:
java/res/values-ca/strings.xml
java/res/values-cs/strings.xml
java/res/values-de/strings.xml
java/res/values-es/strings.xml
java/res/values-hr/strings.xml
java/res/values-hu/strings.xml
java/res/values-it/strings.xml
java/res/values-lv/strings.xml
java/res/values-nb/strings.xml
java/res/values-nl/strings.xml
java/res/values-pl/strings.xml
java/res/values-pt/strings.xml
java/res/values-ro/strings.xml
java/res/values-ru/strings.xml
java/res/values-sv/strings.xml
java/res/values-sw/strings.xml
java/res/values-tr/strings.xml
java/res/values-uk/strings.xml
java/res/values-zh-rCN/strings.xml
java/res/values-zh-rTW/strings.xml
java/src/com/android/inputmethod/latin/RichInputConnection.java
Change-Id: Iba00dd5b86cb16d72968bc7e40d75853845b6dcb
2012-11-06 12:49:53 +09:00
5f2fa6b82c
Tidy up visibility of members of BinaryFormat.
...
Change-Id: I38a00076b82de8e1a19209c67954fe01585f7943
2012-11-05 20:16:52 +09:00
6e66349ed1
Adjust compiler warning options with the offdevice Makefile
...
Make use of AK_FORCE_INLINE for -Winline and better performance
Change-Id: If0016e2ef61c1fe007c83bb1a5133a6b6bde568e
2012-11-05 14:26:53 +09:00
19d844c7a7
Follow up to Ic6af0c596374d936d2b9b31e626fb62bd265ce64
...
Tidy up inline functions with AK_FORCE_INLINE. Moved back some inline methods to header files.
Change-Id: Ibd37b595666ebddda198d9237f19f6712653a8e8
2012-11-03 00:29:40 +09:00
2c2f3a90d8
Add more compiler warning flags
...
Change-Id: Ic6af0c596374d936d2b9b31e626fb62bd265ce64
2012-11-02 18:29:26 +09:00
a323fa6746
A small code cleanup in geometry_utils.h
...
Change-Id: Ie9ff77c661693a1e21d0aa4cfc079bfbf3171f49
2012-11-02 12:25:19 +09:00
a47a777476
Merge "Cleanup logging code"
2012-11-01 02:15:24 -07:00
d42af9da10
Merge "Use sizeof() more safely."
2012-11-01 01:55:03 -07:00
44d9c1ebfc
Use sizeof() more safely.
...
Change-Id: I7cffb4d8da847b483cf4bb482508e3c88c4903be
2012-11-01 17:29:50 +09:00
fca71cfddb
Cleanup logging code
...
Change-Id: Ia604a4fcebfc5179bdbeaa982e052f7d3882ac6e
2012-11-01 17:03:35 +09:00
93b5c2ce63
Make sure PointerTrackerQueue is non-null
...
Change-Id: I2106cf64bed1472fb39d24e7e5bdee7238a30bfe
2012-11-01 15:26:06 +09:00
2db1ea79e6
Merge "Rename SuddenJumpingTouchEventHandler to TouchSCreenRegulator"
2012-10-31 23:23:39 -07:00
081fedc422
Rename SuddenJumpingTouchEventHandler to TouchSCreenRegulator
...
Change-Id: Ia4fb5b3612ff78ed1b243c80a03294b829470f5c
2012-11-01 14:56:32 +09:00
96f5b97e17
Merge "Add a missing report, and fix a wrong report"
2012-10-31 22:36:04 -07:00
271e731eb4
Add a missing report, and fix a wrong report
...
Deleted words would be reported, but added words wouldn't
Also, shortcuts would be reported as bigrams
Change-Id: I017653f2afa65cf16924017a0be2ee2cbd6ca10d
2012-11-01 14:25:53 +09:00
ffb0c093d1
Merge "Move isInvalidCordinates() method to Constants class"
2012-10-31 21:24:01 -07:00
d80286642a
Merge "Cosmetic source code formating change"
2012-10-31 21:23:49 -07:00
0c8a08c141
Merge "Straighten an if-else-if blocks into if-return blocks"
2012-10-31 21:23:35 -07:00
522a22c87b
Merge "Add a "no changes" message in the diff command"
2012-10-31 21:19:47 -07:00
8c02f3005a
Add a "no changes" message in the diff command
...
Also fix a bug where no locale would be interpreted as a
different locale instead of the same.
Change-Id: I296feef45e39a9e89509cb315e789676755141ab
2012-11-01 13:16:58 +09:00
c770c252a6
Merge "Cleaup non-distinct multitouch related stuff"
2012-10-31 21:14:36 -07:00
Baligh Uddin
Tadashi G. Takaoka
Jean Chalard
Ken Wakasa
The Android Open Source Project
Satoshi Kataoka
The Android Automerger