Jean Chalard
5eeff7cf54
Converge paths of an if() branch
...
This is to help with further refactoring.
Change-Id: Ib2459903862570cf7022fd90f2d5c524a6bbbe19
2012-02-19 18:02:40 -08:00
Jean Chalard
1044539080
Rename variables and add comments
...
Change-Id: I746f2364d9f02f22aa6ab57d7060013ee114f4e3
2012-02-19 17:26:41 -08:00
Jean Chalard
9dc0eeae55
Merge "Read the initial selection value."
2012-02-19 16:08:48 -08:00
Jean Chalard
1fead1d5f1
Read the initial selection value.
...
It turns out this was available in an unexpected place.
Fixes both the following bugs
Bug: 5948469
Bug: 6023118
Change-Id: Ie1a91b8268540ea0f0df02bee94c3bbdeb0fa4c5
2012-02-17 20:54:48 -08:00
Eric Fischer
3753a75c65
Merge "Import translations."
2012-02-17 16:38:51 -08:00
Eric Fischer
d1a37520d0
Import translations.
...
Change-Id: I59fdeb4d9df08e82e56d5545ffaaa66e5a04304e
2012-02-17 16:31:50 -08:00
Jean Chalard
1950964157
Merge "Don't assume a word has been added to the user dict"
2012-02-17 15:29:52 -08:00
Tadashi G. Takaoka
97bde43740
Settings key always exists in more keys of shortcut/f1 key
...
This change also
* Fix comman/f1 key for Arabic keyboard.
* Removes "show settings key option" and related stuff.
* Renames and simplifies F2 key to shortcut key on 7 inch tablet.
Change-Id: Ib1cf99ad00d9780a2f0d170260e756771e161521
2012-02-17 01:04:11 -08:00
Tadashi G. Takaoka
fed72d6038
Merge "Support fixed order more keys"
2012-02-17 01:01:28 -08:00
Tadashi G. Takaoka
aeeed75848
Support fixed order more keys
...
Change-Id: I979f54e8b54243da4d23cfbe08198d2aa495f870
2012-02-17 00:49:18 -08:00
Eric Fischer
823b8a4a57
Merge "Import translations."
2012-02-16 21:16:40 -08:00
Jean Chalard
8e4b3bbf9f
Don't assume a word has been added to the user dict
...
The user may now cancel or edit a word upon adding to the
user dictionary. We can no longer assume the word has been
added as is and for the current locale. We should just rely
on standard mechanisms that inform us of new insertions.
Bug: 6015347
Change-Id: I069b19c0c844ca29d6de4c4d162306f9413adea8
2012-02-16 19:19:05 -08:00
Tadashi G. Takaoka
03c3018492
Merge "Use additional proximity chars even when no key is detected."
2012-02-16 19:17:48 -08:00
Tadashi G. Takaoka
9025c55e9f
Use additional proximity chars even when no key is detected.
...
Change-Id: I06a8c66421fcdd43066934ec31d0a38a7cf12bf2
2012-02-16 18:58:47 -08:00
Tadashi G. Takaoka
f6d26b27a0
Merge "Remove unnecessary and harmful KeyboardState.onUpdateShiftState call"
2012-02-16 18:37:59 -08:00
Tadashi G. Takaoka
beb08b398f
Remove unnecessary and harmful KeyboardState.onUpdateShiftState call
...
This change also cancels double tap and long press timers if other
letter key is pressed after shift key.
Bug: 5693999
Bug: 6017610
Change-Id: I3b5f3debfb8915fa73a93b409a38afadf24132e9
2012-02-16 18:02:17 -08:00
Eric Fischer
482e0ef983
Import translations.
...
Change-Id: I20bcfc0d6296dc3606ab027e9c78f17e960e62dc
2012-02-16 15:29:44 -08:00
The Android Open Source Project
b98c25d965
am 90f2ee94: am 41f7d2d9: Reconcile with ics-mr1-release
...
* commit '90f2ee948bd834ac27977b0d7196e725b5123750':
2012-02-16 11:25:41 -08:00
The Android Open Source Project
80bfe0fc2f
am 1a58855d: am caaac8fc: Reconcile with ics-mr1-release
...
* commit '1a58855d5d60ed3237c78b3606aca88ed5e1d10b':
2012-02-16 11:25:25 -08:00
The Android Open Source Project
90f2ee948b
am 41f7d2d9: Reconcile with ics-mr1-release
...
* commit '41f7d2d9e48af6971e7346c69cbc00cea470f9d9':
2012-02-16 10:14:01 -08:00
The Android Open Source Project
41f7d2d9e4
Reconcile with ics-mr1-release
...
Change-Id: I6a64a0f1a121625160e099992ed69637781994d7
2012-02-16 10:11:03 -08:00
The Android Open Source Project
1a58855d5d
am caaac8fc: Reconcile with ics-mr1-release
...
* commit 'caaac8fc842adb06759379438615f454d05f9553':
2012-02-16 10:06:45 -08:00
The Android Open Source Project
caaac8fc84
Reconcile with ics-mr1-release
...
Change-Id: Ie5b83f7f71c9407a451572d9ba0d4609e4bf597f
2012-02-16 10:03:03 -08:00
Jean Chalard
25ff89a75c
Merge "Activate bigram predictions from the binary dictionary"
2012-02-15 20:00:54 -08:00
Jean Chalard
ad290d6505
Activate bigram predictions from the binary dictionary
...
Change-Id: If1cc50539d7677b854b1cd3bea3423c8c0865de5
2012-02-15 19:51:24 -08:00
Jean Chalard
a252e0547f
Reactivate the bigram prediction option
...
Change-Id: Ib4dcd05c4ecf38bdf3d28371fcd9e2259a59ec0c
2012-02-15 19:25:12 -08:00
Eric Fischer
05f09b6d58
Merge "Import translations."
2012-02-14 16:36:51 -08:00
Eric Fischer
a476f75209
Import translations.
...
Change-Id: I9ee2da4706d6847b00f37766f79e73f83ea930d8
2012-02-14 16:32:59 -08:00
Ken Wakasa
95dc18a7c4
Follow up to Ie2416ccd
...
space   got lost in some parsing process
Change-Id: I36f5a9ca7172013ce049041886b9cd98659d38f9
2012-02-15 08:23:34 +09:00
The Android Automerger
08ffdeb534
merge in ics-mr1-release history after reset to ics-mr1
2012-02-14 14:17:15 -08:00
Ken Wakasa
cadce1f5a7
Merge "Use more standard Unicode notations in keyboard layout resource files."
2012-02-14 14:01:51 -08:00
Ken Wakasa
a56639613b
Use more standard Unicode notations in keyboard layout resource files.
...
bug: 5988656
Change-Id: Ie2416ccd790f29934a37e9dc77d7525e5113048a
2012-02-15 06:44:09 +09:00
Jean-Baptiste Queru
26e315785d
resolved conflicts for merge of 3ad1145a
to master
...
Change-Id: I13159b95f90c5095373951bf9e91b7dbf8b14558
2012-02-14 13:09:49 -08:00
Jean-Baptiste Queru
3ad1145a8f
am ec4a8580: am e9768273: am efcb3b95: Merge "[MIPS] Remove reference to NDK"
...
* commit 'ec4a8580257fa78e761a44a68e7c028081c4f559':
[MIPS] Remove reference to NDK
2012-02-14 12:44:57 -08:00
Jean-Baptiste Queru
ec4a858025
am e9768273: am efcb3b95: Merge "[MIPS] Remove reference to NDK"
...
* commit 'e97682739712440d1025c53cd224253ef24f4dfe':
[MIPS] Remove reference to NDK
2012-02-14 12:42:55 -08:00
Jean-Baptiste Queru
e976827397
am efcb3b95: Merge "[MIPS] Remove reference to NDK"
...
* commit 'efcb3b95dff5494660bf34930cda10545d043297':
[MIPS] Remove reference to NDK
2012-02-14 12:39:12 -08:00
Jean-Baptiste Queru
efcb3b95df
Merge "[MIPS] Remove reference to NDK"
2012-02-14 07:55:49 -08:00
Eric Fischer
ad0987c33b
am 30056790: Import translations.
...
* commit '30056790ab1f37a0b92e3f7306402dacba100efa':
Import translations.
2012-02-13 16:47:47 -08:00
Eric Fischer
30056790ab
Import translations.
...
Change-Id: I20219089b9431b0b481b943a298b693e3060ba13
2012-02-13 15:21:40 -08:00
Eric Fischer
b396ea9ede
Import translations. DO NOT MERGE
...
Change-Id: I8be564ef6befc36c59caa155f4b9c6c74740d75b
2012-02-13 15:19:16 -08:00
Ken Wakasa
6a68ebe578
am f6f40539: Minor string updates in Android keyboard settings
...
* commit 'f6f40539aad882492f1773809db17535eb1aab02':
Minor string updates in Android keyboard settings
2012-02-13 10:37:31 -08:00
Ken Wakasa
f6f40539aa
Minor string updates in Android keyboard settings
...
bug: 5999345
Change-Id: I77560b02c71c3ba0c525572b7062ebbfd66b3b85
2012-02-14 03:32:39 +09:00
Ken Wakasa
401966da73
am 09c677f5: Replace UTF-8 string resources with their hex representations
...
* commit '09c677f56ac0f155c6ecce3776d8c93c20625562':
Replace UTF-8 string resources with their hex representations
2012-02-12 02:29:18 -08:00
Ken Wakasa
09c677f56a
Replace UTF-8 string resources with their hex representations
...
bug: 5988656
Change-Id: Ifc3c3a2eccfc23d75b4066c2c9c02c48dacda55b
2012-02-11 23:05:23 +09:00
Eric Fischer
816f51ba11
am 1bd181fe: Import translations.
...
* commit '1bd181fefa348650412b20f89ad683002c206405':
Import translations.
2012-02-10 15:30:37 -08:00
Eric Fischer
1bd181fefa
Import translations.
...
Change-Id: I126a880289de548e914ac442740e789e067e5124
2012-02-10 14:14:38 -08:00
Eric Fischer
3a4d6321aa
Import translations. DO NOT MERGE
...
Change-Id: I6a592e84d239cf9df93f01aa0c2815c8caba7b41
2012-02-10 14:12:06 -08:00
Eric Fischer
9b1cb6d560
am bf01b629: am 5d0aeda9: (-s ours) am f2cacdae: am c85dde47: Import translations. DO NOT MERGE
...
* commit 'bf01b62901cc6009d1284d3940a7a8b9e9a6e0d8':
2012-02-10 10:57:29 -08:00
Eric Fischer
bf01b62901
am 5d0aeda9: (-s ours) am f2cacdae: am c85dde47: Import translations. DO NOT MERGE
...
* commit '5d0aeda964e23e6b96a24539c6430146cc9426e9':
2012-02-10 10:54:05 -08:00
Eric Fischer
5d0aeda964
am f2cacdae: am c85dde47: Import translations. DO NOT MERGE
...
* commit 'f2cacdaeef4f5fd07a51ead76396dbbdad33187b':
2012-02-10 10:49:57 -08:00