5d0aeda964
am f2cacdae: am c85dde47: Import translations. DO NOT MERGE
...
* commit 'f2cacdaeef4f5fd07a51ead76396dbbdad33187b':
2012-02-10 10:49:57 -08:00
cdca8c8e68
am f9c3be4d: (-s ours) am c85dde47: Import translations. DO NOT MERGE
...
* commit 'f9c3be4d8b2016d50c080e23f8cd7d283409e669':
Import translations. DO NOT MERGE
2012-02-10 10:16:10 -08:00
f2cacdaeef
am c85dde47: Import translations. DO NOT MERGE
...
* commit 'c85dde47e89f19aad3a29de08c11ae97f79be618':
Import translations. DO NOT MERGE
2012-02-10 10:13:40 -08:00
f9c3be4d8b
am c85dde47: Import translations. DO NOT MERGE
...
* commit 'c85dde47e89f19aad3a29de08c11ae97f79be618':
Import translations. DO NOT MERGE
2012-02-10 10:12:36 -08:00
c85dde47e8
Import translations. DO NOT MERGE
...
Change-Id: Ia22dacfc8e78a6e4c78f24375c3ef96a01fd4321
2012-02-08 19:21:19 -08:00
32407e615b
am 1b841f56: Reconcile with ics-mr1-release
...
* commit '1b841f56aba672ba938708835aa032ecb126d729':
2012-02-01 10:01:28 -08:00
1b841f56ab
Reconcile with ics-mr1-release
...
Change-Id: I45db7ac0c2fd1156524eb31621fae7661b5a3a73
2012-02-01 08:50:42 -08:00
2577fca158
am 9a84071b: Merge "Make the JNI lib an optional module"
...
* commit '9a84071b36b71c9cf2b454b45308f6c1e22c0c26':
Make the JNI lib an optional module
2012-01-20 12:02:31 -08:00
9a84071b36
Merge "Make the JNI lib an optional module"
2012-01-20 10:37:21 -08:00
bd1ed5b859
Make the JNI lib an optional module
...
Make it a user module will force it installed no matter the
IME is actually required by the product or not. Replace the
user by optional and add requiring the libjni_latinime by using
LOCAL_REQUIRED_MODULES
Change-Id: Ibfc37cf2e2391021d45538c7cea342894b56fbf8
2012-01-19 10:02:25 +08:00
201a8ba853
Reconcile with ics-mr1-release
...
Change-Id: I028e92611bbe6a091de34d99aa58e04b5bcf4892
2012-01-12 08:56:54 -08:00
294d519cf1
merge in ics-mr1-release history after reset to ics-mr1
2012-01-11 16:29:54 -08:00
ed043c61ea
am 4b23789e: Merge "DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well." into ics-mr1
...
* commit '4b23789ecbc3108808c26fee35936d719df2bf73':
DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.
2012-01-11 14:52:23 -08:00
e7fecbc563
am 3e405f3a: DO NOT MERGE. Save keyboard layout only when it is shown
...
* commit '3e405f3afd9bf5c5978d05c07dc186e862885f78':
DO NOT MERGE. Save keyboard layout only when it is shown
2012-01-11 14:50:33 -08:00
4b23789ecb
Merge "DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well." into ics-mr1
2012-01-11 14:49:45 -08:00
3e405f3afd
DO NOT MERGE. Save keyboard layout only when it is shown
...
This is a cherrypick of I150b4a05 from master to ics-mr1.
Bug: 5130446
Bug: 5787394
Change-Id: Ie0d58283042166537ff161344564c3c51b0d1296
2012-01-05 17:28:19 +09:00
2168795ea6
DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.
...
This is a cherry pick of http://android-git.corp.google.com/g/156427 from master.
bug: 5800592
Change-Id: Ifb249e8b6d432bbd1a5faf1a8731deea02962d39
2011-12-26 12:55:32 +09:00
23c45bac20
Reconcile with ics-mr1-release
...
Change-Id: I3b94d0567dc97c60cfb89e5ab5686781dc05025a
2011-12-08 10:22:19 -08:00
79efbece7f
merge in ics-mr1-release history after reset to ics-mr1
2011-12-06 16:55:07 -08:00
c960695f38
Updated keyboard to use SPEAK_PASSWORD preference.
...
Bug: 5678383
Change-Id: Ie9bdc92f4b2c9014159d672b71e4438f8fa34f55
2011-12-06 14:06:57 -08:00
72286e8a08
merge in ics-mr1-release history after reset to ics-mr1
2011-12-05 20:36:35 -08:00
e5db3871b1
Fix a field value for the suggestion max size
...
Bug: 5574747
This bug was introduced by I5e40edf6f790c078c4a05d
Change-Id: I5b0f51e1f5e8a12d786657167082bc604089505e
2011-12-05 12:53:45 +09:00
3a26bdab12
merge in ics-mr1-release history after reset to ics-mr1
2011-12-01 16:46:27 -08:00
e79b1d9b85
Import revised translations. DO NOT MERGE
...
Change-Id: I83fbe8ae8f2630e8dd049b534adf397f0fe18462
2011-12-01 09:59:43 -08:00
0ae011cdf7
merge in ics-mr1-release history after reset to ics-mr1
2011-11-30 06:47:00 -08:00
0aa0cfa90c
Import revised translations. DO NOT MERGE
...
Change-Id: I97c739302c1f2ba14d70c31c8ab620b4b435139f
2011-11-29 13:19:31 -08:00
918a54dda1
merge in ics-mr1-release history after reset to ics-mr1
2011-11-28 12:23:15 -08:00
e4678673f7
merge in ics-mr1-release history after reset to ics-mr1
2011-11-22 11:57:03 -08:00
c053af1e0c
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-21 15:23:04 -08:00
3342c6beaa
Import revised translations. DO NOT MERGE
...
Change-Id: I3dd6c61ed17bfd845d5b3954c194b26970f3e7c2
2011-11-21 15:03:13 -08:00
5619d76584
Shift/Symbol/Smiley will not disable settings/microphone keys
...
Bug: 5560766
Change-Id: Ic2dbb835e87a7debb222093756816e683b464b83
2011-11-17 23:32:19 -08:00
10dff76856
Fix NPE introduced by I38b21d49
...
Bug: 5560766
Change-Id: Ic5eaebe0ef893c69ad90a777ebfa07807535a0e3
2011-11-17 21:46:24 -08:00
15a01d7272
Merge "Do not show key preview of settings and shortcut key" into ics-mr1
2011-11-17 18:02:05 -08:00
137667ed3d
Merge "Ignore microphone and settings key while typing" into ics-mr1
2011-11-17 18:01:43 -08:00
1fcdcc928b
Merge "Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT MERGE)" into ics-mr1
2011-11-17 18:00:36 -08:00
175acb8205
Ignore microphone and settings key while typing
...
Bug: 5560766
Change-Id: I38b21d49b7e803bf94805ba8e13849b3c734e010
2011-11-17 16:01:31 -08:00
ca14c8bf34
Do not show key preview of settings and shortcut key
...
Bug: 5560766
Change-Id: I580efaf4e33f7dfbaa591e2afae9c49547bf26fb
2011-11-17 15:34:57 -08:00
b70841f371
am 4c1dfc62: Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
...
* commit '4c1dfc62c8d59c7503d3635c96a4c1582f9d9e8a':
Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
2011-11-17 14:49:20 -08:00
60acfdf4a8
Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT MERGE)
...
This is cherry-pick of I003101b2 from Master for Bug: 5541192
Bug: 5636367
Change-Id: I560126d17be6a770b19c1f1347332ebdfde5d671
2011-11-17 14:30:54 -08:00
875c16adc3
Merge "Fix long press caps lock handling (DO NOT MERGE)" into ics-mr1
2011-11-17 11:18:28 -08:00
5833ea244a
merge in ics-mr1-release history after reset to ics-mr1
2011-11-17 06:47:26 -08:00
4c1dfc62c8
Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3
...
Bug: 5629373
Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
2011-11-17 16:34:05 +09:00
620b1faf12
Merge "Fix the touch calibration bug" into ics-mr1
2011-11-16 23:23:52 -08:00
554fdd21a1
Fix the touch calibration bug
...
Bug: 5629373
Change-Id: Iacc746e1cc97bf305e1f287cf7431b7115607eeb
2011-11-17 15:56:41 +09:00
d845c26b0e
Merge "Fix IndexOutOfBoundsException in monkey test" into ics-mr1
2011-11-16 17:45:09 -08:00
628ca7a854
Fix long press caps lock handling (DO NOT MERGE)
...
This is cherry-pick of I3850f283.
Bug: 5627467
Change-Id: If46dcbe5bac42b975bd001fefb9f11520a0abb70
2011-11-16 16:50:44 -08:00
d17786fcd2
Fix IndexOutOfBoundsException in monkey test
...
Bug: 5627027
Change-Id: I341cfa5c3d553a1c819d8455936b40a40ad30e87
2011-11-16 15:53:03 -08:00
6644ea8297
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-16 13:27:11 -08:00
168d689ec6
Import revised translations. DO NOT MERGE
...
Change-Id: I9e72643726caf00d8e1acd98d9843576c15f39be
2011-11-16 13:08:54 -08:00
0993a89b31
am 1c0f94c5: Reconcile with ics-factoryrom-2-release
...
* commit '1c0f94c5916921ee861933e080d7b0f711b019e1':
2011-11-16 09:36:12 -08:00
Eric Fischer
The Android Open Source Project
Jean-Baptiste Queru
Robert CH Chou
The Android Automerger
Ken Wakasa
Tadashi G. Takaoka
Alan Viverette
satok