The Android Automerger
|
a280815a40
|
merge in ics-mr1-release history after reset to ics-mr1
|
2011-11-08 06:46:38 -08:00 |
|
Tadashi G. Takaoka
|
c590f203c3
|
am 0e39e820: (-s ours) Merge "Fix referring wrong TypedArray (DO NOT MERGE)" into ics-mr1
* commit '0e39e820ce49b5fc2f8a309c3f64e5b0fefbea48':
Fix referring wrong TypedArray (DO NOT MERGE)
|
2011-11-08 03:18:10 +00:00 |
|
Tadashi G. Takaoka
|
0e39e820ce
|
Merge "Fix referring wrong TypedArray (DO NOT MERGE)" into ics-mr1
|
2011-11-07 19:14:21 -08:00 |
|
Ken Wakasa
|
cea3c5bc17
|
am 0a75373f: Merge "Fix a bug where the UserDictionary may not be released" into ics-mr1
* commit '0a75373f4187d2db036757c2c2bcaba42301fd22':
Fix a bug where the UserDictionary may not be released
|
2011-11-07 23:04:05 +00:00 |
|
Ken Wakasa
|
0a75373f41
|
Merge "Fix a bug where the UserDictionary may not be released" into ics-mr1
|
2011-11-07 15:01:37 -08:00 |
|
Eric Fischer
|
14c4620529
|
am f47e014e: (-s ours) Import revised translations. DO NOT MERGE
* commit 'f47e014eb251ed83c9672b928b45d7340b83c464':
Import revised translations. DO NOT MERGE
|
2011-11-07 20:45:27 +00:00 |
|
Eric Fischer
|
f47e014eb2
|
Import revised translations. DO NOT MERGE
Change-Id: I3650b8f5925e9f71927312acf310f7a165bd4ce3
|
2011-11-07 12:28:16 -08:00 |
|
Jean Chalard
|
8b9c89aee2
|
Fix a bug where the UserDictionary may not be released
Bug: 5547357
Change-Id: I521afeaa349c86fb0087cedb70127de6acebec78
|
2011-11-07 14:31:59 +09:00 |
|
Tadashi G. Takaoka
|
549863a7c5
|
Fix referring wrong TypedArray (DO NOT MERGE)
This is the cherry-pick of Change I2a8f00ed from Master.
Change-Id: I2a8f00edb579e24e612e839498ece097e9d3d7f6
|
2011-11-07 14:09:36 +09:00 |
|
The Android Open Source Project
|
c9a0351a75
|
Reconcile with ics-mr1-release
Change-Id: I709943028122c8f3a72594ccaef4e3a650375749
|
2011-11-04 08:31:42 -07:00 |
|
Tadashi G. Takaoka
|
6c1c546a98
|
Merge "Fix referring wrong TypedArray"
|
2011-11-04 03:47:01 -07:00 |
|
Tadashi G. Takaoka
|
28f6948745
|
Fix referring wrong TypedArray
Change-Id: I2a8f00edb579e24e612e839498ece097e9d3d7f6
|
2011-11-04 19:41:23 +09:00 |
|
Tadashi G. Takaoka
|
cb83b300e7
|
Remember shift locked state when switching between Main keyboard and Symbols
Bug: 5553660
Change-Id: Icb15a9f8a58243bd113c2d4897fee623ac48b66d
|
2011-11-04 17:36:40 +09:00 |
|
Tadashi G. Takaoka
|
1e39565bb4
|
Skip loading keyboard when SoftInputWindow hasn't shown yet.
Bug: 5541192
Change-Id: I003101b2a3fdeb5bb554d249634ec5ab50aea09e
|
2011-11-04 15:01:58 +09:00 |
|
Tadashi G. Takaoka
|
b8291fb46b
|
Merge "Do not clip the popup key preview even if there is no left/right preview icons"
|
2011-11-03 20:19:58 -07:00 |
|
Tadashi G. Takaoka
|
80e9bd34d1
|
Do not clip the popup key preview even if there is no left/right preview icons
Change-Id: Ie51f56c64ba4c69400fe6472b2397ba19ee74911
|
2011-11-04 10:35:06 +09:00 |
|
Eric Fischer
|
fb2f9c1bb1
|
am f8b9e7eb: (-s ours) am 01c335df: (-s ours) Import revised translations. DO NOT MERGE
* commit 'f8b9e7ebeba8e6f42f4af4addf3cea7e962beb1c':
Import revised translations. DO NOT MERGE
|
2011-11-03 00:43:20 +00:00 |
|
Eric Fischer
|
f8b9e7ebeb
|
am 01c335df: (-s ours) Import revised translations. DO NOT MERGE
* commit '01c335df7178e8126617e4e29d5ed6602ff25c4a':
Import revised translations. DO NOT MERGE
|
2011-11-03 00:04:19 +00:00 |
|
Eric Fischer
|
01c335df71
|
Import revised translations. DO NOT MERGE
Change-Id: Ib73d7c6594aef7eb5d2c97fb675dbe5574dd5d12
|
2011-11-02 15:20:22 -07:00 |
|
Eric Fischer
|
adebf1fe72
|
Merge "Import revised translations."
|
2011-11-02 14:10:20 -07:00 |
|
Eric Fischer
|
7a181fdf06
|
Import revised translations.
Change-Id: I3633f1b16fc5f5282e9e60cab104835767ddfb63
|
2011-11-02 10:36:04 -07:00 |
|
Eric Fischer
|
3181251021
|
am db1fc8f5: (-s ours) Import revised translations. DO NOT MERGE
* commit 'db1fc8f59c520990dd1925aa8f2c4042e84c9dcc':
Import revised translations. DO NOT MERGE
|
2011-11-02 17:31:28 +00:00 |
|
The Android Automerger
|
ec36d98bbd
|
merge in ics-mr1-release history after reset to ics-mr1
|
2011-11-02 06:46:56 -07:00 |
|
Jean Chalard
|
2c77216e22
|
Remove trailing spaces when appropriate
Bug: 5509651
Change-Id: I99cfb5a6fc2873e2c11ed16967cd82a7f504a263
|
2011-11-02 19:44:26 +09:00 |
|
Eric Fischer
|
db1fc8f59c
|
Import revised translations. DO NOT MERGE
Change-Id: I63a6dd39a4af314afdb782ea090171c7bc959749
|
2011-11-01 13:38:10 -07:00 |
|
The Android Open Source Project
|
d4eaa1bc32
|
Reconcile with ics-mr1-release
Change-Id: I4ad3da51622d4d250e96cb19c63ad2da723d9e82
|
2011-10-31 13:19:31 -07:00 |
|
Tadashi G. Takaoka
|
824876ebbb
|
Merge "Fix JNI as 64bit ready"
|
2011-10-31 05:49:39 -07:00 |
|
satok
|
cbd8ece513
|
am 352b9310: Merge "Use reflection to get field values of SuggestionSpan" into ics-mr1
* commit '352b93104afa73fd53a04c4414bf382fcf477f04':
Use reflection to get field values of SuggestionSpan
|
2011-10-31 12:26:22 +00:00 |
|
Tadashi G. Takaoka
|
5fdcd7d5cd
|
Fix JNI as 64bit ready
Change-Id: I7a3ed2cee3b20744869aa5cf89ff9fd95f5ab8fe
|
2011-10-31 20:44:01 +09:00 |
|
The Android Automerger
|
b450b39a47
|
merge in ics-mr1-release history after reset to ics-mr1
|
2011-10-30 06:48:06 -07:00 |
|
satok
|
352b93104a
|
Merge "Use reflection to get field values of SuggestionSpan" into ics-mr1
|
2011-10-28 18:26:11 -07:00 |
|
Svetoslav Ganov
|
adc5e6f12c
|
am f2c57551: Merge "Removed lift-to-type from LatinIME accessibility." into ics-mr1
* commit 'f2c57551a70de651dc34bd2d73f5e622ba3887db':
Removed lift-to-type from LatinIME accessibility.
|
2011-10-28 22:27:19 +00:00 |
|
Eric Fischer
|
653dda2865
|
Merge "Import revised translations."
|
2011-10-28 12:16:15 -07:00 |
|
Eric Fischer
|
f1a44148d1
|
Import revised translations.
Change-Id: I980a04f15289bc1af6b150e4329795865686de63
|
2011-10-28 11:39:17 -07:00 |
|
Svetoslav Ganov
|
f2c57551a7
|
Merge "Removed lift-to-type from LatinIME accessibility." into ics-mr1
|
2011-10-28 11:13:15 -07:00 |
|
satok
|
68ef7b77ed
|
Use reflection to get field values of SuggestionSpan
Bug: 5440299
Change-Id: I5e40edf6f790c078c4a05d0d347a89d63f7c042a
|
2011-10-28 19:03:49 +09:00 |
|
Tadashi G. Takaoka
|
7e8cf3c093
|
Merge "Remove NULL from native/jni"
|
2011-10-28 01:14:47 -07:00 |
|
Tadashi G. Takaoka
|
94810dec21
|
Remove NULL from native/jni
Change-Id: I7c4e32d0d69876c7ea85d6997c9a40fa362152eb
|
2011-10-28 17:06:58 +09:00 |
|
Tadashi G. Takaoka
|
0e97148f6d
|
Remove NULL from native/src
Change-Id: I5299af7773d28fd12faebbfe644829a401ae5644
|
2011-10-28 17:02:09 +09:00 |
|
Tadashi G. Takaoka
|
5049f5bbb4
|
Fix trivial compile issue
Change-Id: I9dbc51496dbdb2195bbe589b0c3b2cd7e3d2f1fc
|
2011-10-28 16:24:31 +09:00 |
|
Tadashi G. Takaoka
|
6f811bd13f
|
Merge "Make some private method static"
|
2011-10-27 22:57:58 -07:00 |
|
Tadashi G. Takaoka
|
8fbf29e2d5
|
Make some private method static
Change-Id: Ia23765268be0ef89d7fe7c3f5372ed32d6615765
|
2011-10-28 13:31:31 +09:00 |
|
Tadashi G. Takaoka
|
3122cf8daa
|
am 07a44557: Merge "Cancel pending rotation when another rotation start" into ics-mr1
* commit '07a445572f7fa21c0e24f5cdb0f0b88ff2adc672':
Cancel pending rotation when another rotation start
|
2011-10-27 22:59:14 +00:00 |
|
Tadashi G. Takaoka
|
07a445572f
|
Merge "Cancel pending rotation when another rotation start" into ics-mr1
|
2011-10-27 15:55:41 -07:00 |
|
Eric Fischer
|
69c81ff941
|
am 2e5e173a: (-s ours) am f4c1cd77: (-s ours) Import revised translations. DO NOT MERGE
* commit '2e5e173a85c157ea087fca01c5b09faa4f57211c':
Import revised translations. DO NOT MERGE
|
2011-10-27 21:54:20 +00:00 |
|
Eric Fischer
|
2e5e173a85
|
am f4c1cd77: (-s ours) Import revised translations. DO NOT MERGE
* commit 'f4c1cd7729eea7a48e084eaea0cb28013d9131ae':
Import revised translations. DO NOT MERGE
|
2011-10-27 21:46:49 +00:00 |
|
Ken Wakasa
|
24ddc12eb7
|
Merge "Display "Touch again to save" in the keyboard locale"
|
2011-10-27 09:58:08 -07:00 |
|
Eric Fischer
|
f4c1cd7729
|
Import revised translations. DO NOT MERGE
Change-Id: I10bc743f4d9c8c53beab37a5135e634ddf8bb99e
|
2011-10-27 09:54:05 -07:00 |
|
Eric Fischer
|
79fb53a83a
|
am d36f3f83: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'd36f3f8393704b2d5a82d52f8df3a1db398c2853':
Import revised translations. DO NOT MERGE
|
2011-10-27 16:51:09 +00:00 |
|
Eric Fischer
|
d36f3f8393
|
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
|
2011-10-27 09:46:05 -07:00 |
|