bf33637eb2
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-20 11:28:36 -07:00
2a4e1b6dd3
Import revised translations. DO NOT MERGE
...
Change-Id: I6065f17e96761b203ebff71f81e1feb9de518aad
2011-10-20 11:16:39 -07:00
f8bd4c5c9d
am 49426a1e: Fix potential NPE
...
* commit '49426a1ea941c0331a6e573e36cff3c3a8e8849c':
Fix potential NPE
2011-10-20 07:08:03 -07:00
a09d7187a7
merge in ics-release history after reset to master
2011-10-20 07:02:01 -07:00
49426a1ea9
Fix potential NPE
...
Bug: 5462524
Change-Id: I76012d1bbcd83d58f034c2f588802e4d1b7edc4d
2011-10-20 20:31:17 +09:00
f08c697313
am 9f058749: am 61aebb0a: Merge "Update suggestions strip divider" into ics-mr0
...
* commit '9f058749f2e8bf9194034d273535c960fe811161':
Update suggestions strip divider
2011-10-19 18:13:27 -07:00
9f058749f2
am 61aebb0a: Merge "Update suggestions strip divider" into ics-mr0
...
* commit '61aebb0a1e3d12cd5287c9be3c2e37df565af888':
Update suggestions strip divider
2011-10-19 18:11:20 -07:00
61aebb0a1e
Merge "Update suggestions strip divider" into ics-mr0
2011-10-19 18:09:17 -07:00
d44f5cecc9
am 461629b8: (-s ours) am 78674d0f: (-s ours) Add warning log for unexpected inputType (DO NOT MERGE)
...
* commit '461629b84dc0b084ec922e871b764bc295b6b3e1':
Add warning log for unexpected inputType (DO NOT MERGE)
2011-10-19 10:34:57 -07:00
461629b84d
am 78674d0f: (-s ours) Add warning log for unexpected inputType (DO NOT MERGE)
...
* commit '78674d0ff7f7126da9a2267b6c764f3222232b90':
Add warning log for unexpected inputType (DO NOT MERGE)
2011-10-19 10:31:39 -07:00
44d206d69f
merge in ics-release history after reset to master
2011-10-19 07:45:06 -07:00
18bade1b9b
am 82c8c2e6: Add warning log for unexpected inputType
...
* commit '82c8c2e6c00386ae9925fff68ea77bc448897cbd':
Add warning log for unexpected inputType
2011-10-19 02:54:56 -07:00
78674d0ff7
Add warning log for unexpected inputType (DO NOT MERGE)
...
This is a cherry-pick of I3484c751 from Master.
Bug: 5130446
Change-Id: I140980bf093fb3310496c8021166d16f0ddc362f
2011-10-19 18:52:07 +09:00
2c47080e7b
Update suggestions strip divider
...
Bug: 5142447
Change-Id: I275a304e46456e3b80968fb5de330a3b04bd2035
2011-10-19 16:54:37 +09:00
82c8c2e6c0
Add warning log for unexpected inputType
...
Bug: 5130446
Change-Id: I3484c75144ba68db0734a4d38186d2eafd1b1879
2011-10-19 16:53:07 +09:00
a1b6e32cf4
am cc02aa8a: Fix missing TypedArray.recycle calls
...
* commit 'cc02aa8af35b85cb564503c7b54e1eae6a6b6169':
Fix missing TypedArray.recycle calls
2011-10-18 21:15:19 -07:00
cc02aa8af3
Fix missing TypedArray.recycle calls
...
Change-Id: I333e55b4e7925dac5495e2e73ac57ffcef4fabb4
2011-10-19 13:06:33 +09:00
5304d6968b
am f6dffc30: Merge "Import revised translations."
...
* commit 'f6dffc3089f45aa630b1f2cd66b84be9119ae5c5':
Import revised translations.
2011-10-18 16:39:04 -07:00
f6dffc3089
Merge "Import revised translations."
2011-10-18 16:36:38 -07:00
d707eeceb5
Import revised translations.
...
Change-Id: I3c98722dfddac5fe3b600cae61255f15540666e4
2011-10-18 15:50:51 -07:00
48c0bb1818
am 1276434c: (-s ours) am 167f76aa: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '1276434ce54505559c76c51b5c6188b3f76099e4':
Import revised translations. DO NOT MERGE
2011-10-18 11:41:21 -07:00
1276434ce5
am 167f76aa: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '167f76aacbcfbc4963ce1eb8819f1bb2ad786d34':
Import revised translations. DO NOT MERGE
2011-10-18 11:38:38 -07:00
167f76aacb
Import revised translations. DO NOT MERGE
...
Change-Id: I6eaad7122120f7b6454028d5cae2b1db85a7280a
2011-10-18 11:16:04 -07:00
8984c55bf7
merge in ics-release history after reset to master
2011-10-18 07:00:54 -07:00
14be523330
am bf7d8ecb: Merge "Close XmlResourceParser when finish parsing"
...
* commit 'bf7d8ecb48b1d47d6555d508d0c6a56e0a06efd2':
Close XmlResourceParser when finish parsing
2011-10-17 19:12:36 -07:00
bf7d8ecb48
Merge "Close XmlResourceParser when finish parsing"
2011-10-17 19:11:12 -07:00
f0ecb19fdd
am c5d51a40: am fe2d9079: Fix a bug that the typed word with the blue underline indicator will be duplicated
...
* commit 'c5d51a40a444c65bbca2a8bdcf0b4d6a05f59e77':
Fix a bug that the typed word with the blue underline indicator will be duplicated
2011-10-17 11:40:52 -07:00
c5d51a40a4
am fe2d9079: Fix a bug that the typed word with the blue underline indicator will be duplicated
...
* commit 'fe2d90798ea409ee39d6f63942eb01bb7eed98e3':
Fix a bug that the typed word with the blue underline indicator will be duplicated
2011-10-17 11:32:24 -07:00
ddd759aa9e
Close XmlResourceParser when finish parsing
...
Change-Id: If21ee187c83f044b235d88fba15af00e6ac8a308
2011-10-18 02:44:55 +09:00
fe2d90798e
Fix a bug that the typed word with the blue underline indicator will be duplicated
...
Bug: 5466373
Change-Id: I0300c34cb6076b12ecb89cb29bea95288559108f
2011-10-17 13:25:22 +09:00
dc53810e3e
merge in ics-release history after reset to master
2011-10-16 07:00:51 -07:00
24c8f03d27
am d2bc850c: am 908a2f63: Merge "Special handling of one key mini-keyboard to mitigate visual flicker" into ics-mr0
...
* commit 'd2bc850c4c60dbb70e1a5edcf7f4dc4c64752fa2':
Special handling of one key mini-keyboard to mitigate visual flicker
2011-10-14 12:23:21 -07:00
432fa42cb0
am 75c4b5fe: am 5ad37baf: Merge "Release bitmap buffer when KeyboardView is detached from Window" into ics-mr0
...
* commit '75c4b5fe1bbc7736d05abd7940825a30339c65fc':
Release bitmap buffer when KeyboardView is detached from Window
2011-10-14 12:23:20 -07:00
d2bc850c4c
am 908a2f63: Merge "Special handling of one key mini-keyboard to mitigate visual flicker" into ics-mr0
...
* commit '908a2f63949687c9e7acb2e3d50fd50815582e8b':
Special handling of one key mini-keyboard to mitigate visual flicker
2011-10-14 12:21:17 -07:00
75c4b5fe1b
am 5ad37baf: Merge "Release bitmap buffer when KeyboardView is detached from Window" into ics-mr0
...
* commit '5ad37baf1e09416b197da76881a30e79ac2032c7':
Release bitmap buffer when KeyboardView is detached from Window
2011-10-14 12:21:17 -07:00
908a2f6394
Merge "Special handling of one key mini-keyboard to mitigate visual flicker" into ics-mr0
2011-10-14 12:20:02 -07:00
5ad37baf1e
Merge "Release bitmap buffer when KeyboardView is detached from Window" into ics-mr0
2011-10-14 12:19:49 -07:00
7d3f77b6ed
am c1981eb8: am 59a55fcb: Merge "Set SuggestionSpan with FLAG_AUTO_CORRECTION as a composing span" into ics-mr0
...
* commit 'c1981eb83b8be28752ff9d9ca27fa856074e83c8':
Set SuggestionSpan with FLAG_AUTO_CORRECTION as a composing span
2011-10-14 11:23:50 -07:00
c1981eb83b
am 59a55fcb: Merge "Set SuggestionSpan with FLAG_AUTO_CORRECTION as a composing span" into ics-mr0
...
* commit '59a55fcbec6e9f2b856c3876e51da6191fd2774e':
Set SuggestionSpan with FLAG_AUTO_CORRECTION as a composing span
2011-10-14 11:16:59 -07:00
59a55fcbec
Merge "Set SuggestionSpan with FLAG_AUTO_CORRECTION as a composing span" into ics-mr0
2011-10-14 11:15:14 -07:00
53af4ae634
Set SuggestionSpan with FLAG_AUTO_CORRECTION as a composing span
...
Bug: 5460262
Change-Id: Ibeb875bb885fb663ed23f0299d671e995a66b642
2011-10-15 02:02:41 +09:00
28d841534d
Release bitmap buffer when KeyboardView is detached from Window
...
Bug: 5450387
Change-Id: I3e60edd8c0ea70aff9e484f6e00dadcc8f8981f6
2011-10-14 20:13:16 +09:00
a0e4f40994
Special handling of one key mini-keyboard to mitigate visual flicker
...
Use pre-computed width and height of mini keyboard if
* Popup key preview is enabled
* The mini keyboard has only one key
* Pre-computed width and height are specified
Bug: 5248783
Change-Id: I53475698e87d5bd67d36e63323c25a9e9f18fbb1
2011-10-14 17:49:48 +09:00
621bc27b30
am ce6aa898: Merge "Calculate edit distances incrementally."
...
* commit 'ce6aa8982742b5bdea3daa1b6a337e7e9acdc58c':
Calculate edit distances incrementally.
2011-10-13 23:10:22 -07:00
ce6aa89827
Merge "Calculate edit distances incrementally."
2011-10-13 23:08:46 -07:00
04d8737015
Calculate edit distances incrementally.
...
Change-Id: I3ee734b9b71351523dc8658cba33d6c8435e348e
2011-10-14 14:29:28 +09:00
2b28599190
am 6262fa53: am ed6bc82d: Merge "Revert "Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced"" into ics-mr0
...
* commit '6262fa5307ae57bae9640cc763ad1fe529af7a43':
Revert "Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced"
2011-10-13 22:10:22 -07:00
3d970ae6cd
am 8aecd2c9: am 431452d0: Revised Arabic alternates
...
* commit '8aecd2c990bb26d17253e48854563e19fb8b5338':
Revised Arabic alternates
2011-10-13 22:10:22 -07:00
6262fa5307
am ed6bc82d: Merge "Revert "Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced"" into ics-mr0
...
* commit 'ed6bc82d9785372c407e1a4f563ae7d30c479b8a':
Revert "Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced"
2011-10-13 22:09:08 -07:00
8aecd2c990
am 431452d0: Revised Arabic alternates
...
* commit '431452d04bdb65916a23ec9ca66cfe06282f6e4a':
Revised Arabic alternates
2011-10-13 22:09:07 -07:00
Eric Fischer
Tadashi G. Takaoka
The Android Automerger
satok
Yusuke Nojima