6d05505bbf
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-12 15:47:29 +09:00
eaaee28647
Merge "Enhance ImfUtils to InputMethodManagerWrapper class"
2012-11-11 22:43:07 -08:00
6fbbab3b84
Enhance ImfUtils to InputMethodManagerWrapper class
...
Change-Id: I6ff86ee819a446dd3ed5f9c3400d23564027b020
2012-11-12 15:23:43 +09:00
5d51e8f997
Remove backup agent from AOSP Android Keyboard
...
Bug: 4590284
Change-Id: I22f0e42cb898d20dfc2c4506493bf48170ce7b04
2012-11-12 12:37:25 +09:00
f3b0e9a56c
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-10 20:18:34 +09:00
53bd25bf3a
Import translations. DO NOT MERGE
...
Change-Id: Ibf5dc194560d09cc1945c5478197b9170c176492
Auto-generated-cl: translation import
2012-11-09 12:45:34 -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
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
8df57deb05
Import translations. DO NOT MERGE
...
Change-Id: I97ceec5680a8ba9f27d5f62a7573555590268376
Auto-generated-cl: translation import
2012-11-06 16:54:45 -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
a47a777476
Merge "Cleanup logging code"
2012-11-01 02:15:24 -07: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
081fedc422
Rename SuddenJumpingTouchEventHandler to TouchSCreenRegulator
...
Change-Id: Ia4fb5b3612ff78ed1b243c80a03294b829470f5c
2012-11-01 14:56:32 +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
a232930d9c
Straighten an if-else-if blocks into if-return blocks
...
Change-Id: If3eede1257658f27384e3efc72586fabbed19f7b
2012-11-01 13:14:19 +09:00
24ab8055aa
Move isInvalidCordinates() method to Constants class
...
Change-Id: Iad1464c299ad6055af1db1ff7978e5cd9a14750f
2012-11-01 13:12:58 +09:00
20dd1bc090
Cosmetic source code formating change
...
Change-Id: I3a53b49afab70dfb13f12027070635da6001eb79
2012-11-01 13:10:44 +09:00
13ae76d7a3
Cleaup non-distinct multitouch related stuff
...
Change-Id: I09072267217caad2513f83b61d7db1c6d74e18d1
2012-11-01 13:04:49 +09:00
1e61493c50
Use 32-bit code points for suggestions output
...
This is a multi-project commit with Ic43dd666
bug: 6526418
Change-Id: I39c1acb4e91d04cd8a4ec5a943c8cf575da75ebc
2012-11-01 00:09:51 +09:00
0ea2c80d8d
Merge "Consolidate two helper methods (refactor step 3)"
2012-10-31 03:58:47 -07:00
661bc810e5
Merge "Flatten nested if-else blocks into plain if-else blocks (refactor step 2.5)"
2012-10-31 03:46:05 -07:00
831198a4e4
Consolidate two helper methods (refactor step 3)
...
Change-Id: I8b8522d1e5342fc73346ba2748e75f0c1d5bf03c
2012-10-31 19:45:29 +09:00
2a3b15b267
Flatten nested if-else blocks into plain if-else blocks (refactor step 2.5)
...
Change-Id: I42aad04658e14e8fd703e3828676719a333ec8f9
2012-10-31 19:44:45 +09:00
8ae9fbef77
Merge "Separate nested if-blocks into helper methods (refactor step 2)"
2012-10-31 03:43:27 -07:00
3c6d3a4df8
Separate nested if-blocks into helper methods (refactor step 2)
...
Change-Id: Ic0ed243f8c1fbf62793565ee37175270b47f0801
2012-10-31 19:34:43 +09:00
dd43dd61eb
Merge "Separate nested if-blocks into helper methods (refactor step 1)"
2012-10-31 03:18:08 -07:00
8b449c6dda
Separate nested if-blocks into helper methods (refactor step 1)
...
Change-Id: I87ef8b174295fb12a91fec35acd3b0cc152ad8f0
2012-10-31 18:40:28 +09:00
0b900f5e64
Merge "Add a plumbing option to dicttool info."
2012-10-31 00:54:17 -07:00
51a0ef8c59
Add a plumbing option to dicttool info.
...
Also align the `porcelain' option to the diff command
that was used mistakenly.
Bug: 7388665
Change-Id: Ic0e1b98c62ce37b2e909384a0370af4458563703
2012-10-31 16:35:22 +09:00
33aa6e3cf0
Escape "#" sign in XML file
...
Change-Id: Icd38abc4a0454ca949613d8c4bb528758cd990d8
2012-10-31 14:26:03 +09:00
c7318bbc0b
Fix possible NPE
...
Bug: 7398904
Change-Id: I6b7aba7a9bf52ca494cb4390b19525c98790bd49
2012-10-29 18:40:37 +09:00
cfbfb1c50a
Remove reference of android.util.Log in Constants class
...
This is a follow up of Iee01d4d2.
Change-Id: I0bcd349d317d9f7d40ef0574e72c640f9f990c5d
2012-10-29 17:25:13 +09:00
7947eaf475
Merge "Move code point constants from Keyboard to Constants class"
2012-10-29 00:10:52 -07:00
240871ecaf
Move code point constants from Keyboard to Constants class
...
Change-Id: Iee01d4d2b916d0b584531104ac865ae6e6370a3d
2012-10-29 16:04:20 +09:00
f41389a74b
Remove warnings
...
Thanks Eclipse
Change-Id: I88e3979ed22be5d8be5a5accdde417c6b1a8bf2d
2012-10-29 14:24:16 +09:00
a23e333079
Implement the word-level diff (A9)
...
Bug: 7388857
Change-Id: I4c4560d4f4b579936a44cdf409a4c27300b65610
2012-10-29 12:31:22 +09:00
d505319a25
am 5199b8bf: am f6df37ce: Merge "LatinIME: Add accents to german keyboard"
...
* commit '5199b8bf1a212b93c9f37d4bb18121ba7f174bd0':
LatinIME: Add accents to german keyboard
2012-10-25 23:13:48 -07:00
5199b8bf1a
am f6df37ce: Merge "LatinIME: Add accents to german keyboard"
...
* commit 'f6df37ce2dce9ada1af097e0c2fbdd84c0334c61':
LatinIME: Add accents to german keyboard
2012-10-25 23:11:21 -07:00
6067b9e1bd
am ef5f88f3: am 5e118c4c: am 60dea36d: Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
...
* commit 'ef5f88f33e432284c958fafe18f891a10f77e1f9':
Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
2012-10-25 19:31:27 -07:00
60dea36daf
Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
...
Bug: 7393485
Bug: 7272829
Change-Id: I873e8d99486c734e76484526631a90fc55e91c86
2012-10-25 20:00:46 +09:00
Ken Wakasa
Tadashi G. Takaoka
Satoshi Kataoka
Baligh Uddin
Jean Chalard