03d59130c1
am bf33637e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit 'bf33637eb26bf3304159a9b4f53ab278363c7d62':
Import revised translations. DO NOT MERGE
2011-10-20 11:32:09 -07:00
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
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
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
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
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
cc02aa8af3
Fix missing TypedArray.recycle calls
...
Change-Id: I333e55b4e7925dac5495e2e73ac57ffcef4fabb4
2011-10-19 13:06:33 +09: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
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
bf7d8ecb48
Merge "Close XmlResourceParser when finish parsing"
2011-10-17 19:11:12 -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
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
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
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
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
ed6bc82d97
Merge "Revert "Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced"" into ics-mr0
2011-10-13 22:07:17 -07:00
d874ac581e
Revert "Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced"
...
This reverts commit b1bc5fd896
2011-10-14 12:15:24 +09:00
3090216071
merge in ics-release history after reset to master
2011-10-13 07:00:46 -07:00
431452d04b
Revised Arabic alternates
...
Bug: 5439635
Change-Id: Ic6ea1317f8892d5dbaaa7e0cbb274e8e06ea89d7
2011-10-13 21:45:06 +09:00
b94166dedd
am 31e6d20d: Merge "Use consecutive Arabic TATWEEL for its label for discrimination" into ics-mr0
...
* commit '31e6d20db0c0883736a81bbc606d19a8710264b1':
Use consecutive Arabic TATWEEL for its label for discrimination
2011-10-12 23:50:12 -07:00
31e6d20db0
Merge "Use consecutive Arabic TATWEEL for its label for discrimination" into ics-mr0
2011-10-12 23:48:44 -07:00
22c2a23cda
am 605a6fea: Merge "Fix the safety net Bug: 5453150" into ics-mr0
...
* commit '605a6fea750c4acc96a5136ecaf7162e0a858b9f':
Fix the safety net Bug: 5453150
2011-10-12 23:46:25 -07:00
706114382e
Use consecutive Arabic TATWEEL for its label for discrimination
...
Bug: 5446409
Change-Id: I448b39fda42d51139f53c9a48b1d743c5495fb51
2011-10-13 15:45:12 +09:00
605a6fea75
Merge "Fix the safety net Bug: 5453150" into ics-mr0
2011-10-12 23:44:54 -07:00
2aa1dd45c4
Fix the safety net
...
Bug: 5453150
Change-Id: I5990feb2622738988bf29843c6bcdb9cbf8bbf33
2011-10-13 15:16:59 +09:00
ca922b440a
am 8a4472f0: Merge "Update virtual LED on shift keys" into ics-mr0
...
* commit '8a4472f0ecd774757c7077a40585f2d05e4f9210':
Update virtual LED on shift keys
2011-10-12 23:16:53 -07:00
8a4472f0ec
Merge "Update virtual LED on shift keys" into ics-mr0
2011-10-12 23:15:05 -07:00
1d8abfcf29
Update virtual LED on shift keys
...
Bug: 5142447
Change-Id: I69ca713071bca5a9ff3a0b710e1821264a15ea18
2011-10-13 13:58:46 +09:00
283d35cb6c
am 62fb8a48: Merge "Take invisible extractArea height into account" into ics-mr0
...
* commit '62fb8a480df325ebc6b2a4dc023a944e3cd0bcef':
Take invisible extractArea height into account
2011-10-12 12:00:44 -07:00
Eric Fischer
The Android Automerger
Tadashi G. Takaoka
satok
Yusuke Nojima