Jean Chalard
940d6250bf
am ce86e39e
: Merge "Cleanup."
...
* commit 'ce86e39e002caf0507305754e2c39010866e7ecc':
Cleanup.
2011-11-21 00:56:03 -08:00
Jean Chalard
ce86e39e00
Merge "Cleanup."
2011-11-21 00:53:49 -08:00
Jean Chalard
5d5028f2c5
Remove an unused (and scary) method
...
Change-Id: I14a545a3e4955a25fde17554156552c755d44e2f
2011-11-21 17:45:32 +09:00
Jean Chalard
9727900142
am 6ecd1e12
: Merge "Special case quotes at start and end of words"
...
* commit '6ecd1e1280578e95e5c2e24046cf67f0f7260c3b':
Special case quotes at start and end of words
2011-11-21 00:23:35 -08:00
Jean Chalard
6ecd1e1280
Merge "Special case quotes at start and end of words"
2011-11-21 00:21:09 -08:00
Jean Chalard
c83359f974
Special case quotes at start and end of words
...
Single quote at start of word is not considered a part of a
word any more.
Single quote at the end of a word now behave like capitalization:
lookup in the dictionary is done *disregarding* a final quote,
and it is forcefully added back into the suggestions afterwards.
Bug: 5566368
Change-Id: I14dd3815f4b743edba56d64a3abdf4b73d863a6a
2011-11-21 16:34:39 +09:00
Tadashi G. Takaoka
e7b06ba2da
am 0e427573
: Tweak number and phone keyboard layout of tablet
...
* commit '0e4275730b7a90a51974ad8c40e0f46e4a63aaa1':
Tweak number and phone keyboard layout of tablet
2011-11-18 17:35:53 -08:00
Tadashi G. Takaoka
0e4275730b
Tweak number and phone keyboard layout of tablet
...
Change-Id: Icb2f146becb7f834adba2612c9420a8f2d1e87fc
2011-11-18 17:27:55 -08:00
Tadashi G. Takaoka
07eda8be1e
am 0be36ee0
: Add left/right padding to phone/number layout of tablet
...
* commit '0be36ee096eccea7aff5dc5d0505420ae55dc8ce':
Add left/right padding to phone/number layout of tablet
2011-11-18 17:24:46 -08:00
Tadashi G. Takaoka
0be36ee096
Add left/right padding to phone/number layout of tablet
...
Change-Id: Ida6b458f3233cd4ea3ae71e07e2a5c80c7750954
2011-11-18 17:19:58 -08:00
Tadashi G. Takaoka
529f74a4e1
am b98578ed
: Copy number/phone keyboard layout of tablet
...
* commit 'b98578ed0bda6020ac7bea168e1d032599f46e58':
Copy number/phone keyboard layout of tablet
2011-11-18 17:19:00 -08:00
Tadashi G. Takaoka
b98578ed0b
Copy number/phone keyboard layout of tablet
...
Change-Id: I63e576ea88db313ede89f2517436071f5c391204
2011-11-18 17:16:15 -08:00
Tadashi G. Takaoka
3dc1495126
am f3dfa550
: Merge "Introduce noKeyPreview Key attribute"
...
* commit 'f3dfa55029a1ccaf7d98a456878ae0d9eab0ed06':
Introduce noKeyPreview Key attribute
2011-11-18 16:31:12 -08:00
Tadashi G. Takaoka
f3dfa55029
Merge "Introduce noKeyPreview Key attribute"
2011-11-18 16:28:54 -08:00
The Android Open Source Project
b62c3aca60
am b0700a34
: Reconcile with ics-mr1-release
...
* commit 'b0700a342e41e34d5ab6fda1eb25fcdbe2da927a':
2011-11-18 15:46:42 -08:00
The Android Open Source Project
b0700a342e
Reconcile with ics-mr1-release
...
Change-Id: I0d6cb047da185ed18a4cb859a8c7c7585aa91930
2011-11-18 15:43:42 -08:00
Tadashi G. Takaoka
fb8d1720a4
am e00ede53
: am 5619d765
: Shift/Symbol/Smiley will not disable settings/microphone keys
...
* commit 'e00ede531fa8f3478207cbde1a03db1904d9e02f':
Shift/Symbol/Smiley will not disable settings/microphone keys
2011-11-18 15:28:01 -08:00
Tadashi G. Takaoka
e00ede531f
am 5619d765
: Shift/Symbol/Smiley will not disable settings/microphone keys
...
* commit '5619d7658459d13723b6d7ad8969b249adf9e717':
Shift/Symbol/Smiley will not disable settings/microphone keys
2011-11-18 15:23:14 -08:00
Tadashi G. Takaoka
0c0beffba0
am 5dc318a3
: am 10dff768
: Fix NPE introduced by I38b21d49
...
* commit '5dc318a3f20bc2e176fb2627f606f3861adf849e':
Fix NPE introduced by I38b21d49
2011-11-18 14:52:35 -08:00
Tadashi G. Takaoka
5dc318a3f2
am 10dff768
: Fix NPE introduced by I38b21d49
...
* commit '10dff76856a98b6eec86a53d3d07fdc9708037b7':
Fix NPE introduced by I38b21d49
2011-11-18 14:48:05 -08:00
Tadashi G. Takaoka
431ce93925
Introduce noKeyPreview Key attribute
...
This change also removes hacks in LatinKeyboardView by utilizing
noKeyPreview attribute.
Bug: 5638595
Change-Id: Icd8a3af3b7849b941f8f5532e2b432e126a909e6
2011-11-18 14:40:05 -08:00
Tadashi G. Takaoka
312ef1ee75
am 18630d5f
: am 15a01d72
: Merge "Do not show key preview of settings and shortcut key" into ics-mr1
...
* commit '18630d5fd681ab853befe7fffb67e3db9c9ea0f1':
Do not show key preview of settings and shortcut key
2011-11-18 09:18:24 -08:00
Tadashi G. Takaoka
18630d5fd6
am 15a01d72
: Merge "Do not show key preview of settings and shortcut key" into ics-mr1
...
* commit '15a01d72724ce7f0a9a5814443a03b907962f3fd':
Do not show key preview of settings and shortcut key
2011-11-18 09:15:52 -08:00
Tadashi G. Takaoka
ea953fd555
am 49cc3beb
: resolved conflicts for merge of 137667ed
to master
...
* commit '49cc3beb75e2916037a0f8ff2d2795f306918598':
Ignore microphone and settings key while typing
2011-11-18 09:15:36 -08:00
Tadashi G. Takaoka
49cc3beb75
resolved conflicts for merge of 137667ed
to master
...
Change-Id: I75fc5d278b002ab89dd2475d282d0ee4aede7817
2011-11-18 08:51:39 -08:00
Tadashi G. Takaoka
a25c8e69c2
am a41fddc6
: am 1fcdcc92
: (-s ours) Merge "Skip loading keyboard when SoftInputWindow hasn\'t shown yet. (DO NOT MERGE)" into ics-mr1
...
* commit 'a41fddc67668ab85c83dbed40602d2b2a5bd47e5':
Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT MERGE)
2011-11-18 02:42:39 -08:00
Tadashi G. Takaoka
a41fddc676
am 1fcdcc92
: (-s ours) Merge "Skip loading keyboard when SoftInputWindow hasn\'t shown yet. (DO NOT MERGE)" into ics-mr1
...
* commit '1fcdcc928ba21a7a1a4d3a64c1d1f8fa399099ff':
Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT MERGE)
2011-11-18 02:37:54 -08:00
Tadashi G. Takaoka
5619d76584
Shift/Symbol/Smiley will not disable settings/microphone keys
...
Bug: 5560766
Change-Id: Ic2dbb835e87a7debb222093756816e683b464b83
2011-11-17 23:32:19 -08:00
Jean Chalard
88562bec54
Cleanup.
...
Fix a typo, and move a cursor.close() in a finally{} clause
Change-Id: Iac011ebb80b9430774c7dc5cd94728d05cef443f
2011-11-18 15:24:49 +09:00
Tadashi G. Takaoka
10dff76856
Fix NPE introduced by I38b21d49
...
Bug: 5560766
Change-Id: Ic5eaebe0ef893c69ad90a777ebfa07807535a0e3
2011-11-17 21:46:24 -08:00
Tadashi G. Takaoka
15a01d7272
Merge "Do not show key preview of settings and shortcut key" into ics-mr1
2011-11-17 18:02:05 -08:00
Tadashi G. Takaoka
137667ed3d
Merge "Ignore microphone and settings key while typing" into ics-mr1
2011-11-17 18:01:43 -08:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
175acb8205
Ignore microphone and settings key while typing
...
Bug: 5560766
Change-Id: I38b21d49b7e803bf94805ba8e13849b3c734e010
2011-11-17 16:01:31 -08:00
satok
783d173133
am 7800a313
: am b70841f3
: am 4c1dfc62
: Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
...
* commit '7800a313f10ebeba32864d66edd55e6a5db80114':
Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
2011-11-17 16:00:21 -08:00
satok
7800a313f1
am b70841f3
: am 4c1dfc62
: Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
...
* commit 'b70841f371e48731732044924b87cd824e327297':
Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
2011-11-17 15:56:30 -08:00
Tadashi G. Takaoka
ca14c8bf34
Do not show key preview of settings and shortcut key
...
Bug: 5560766
Change-Id: I580efaf4e33f7dfbaa591e2afae9c49547bf26fb
2011-11-17 15:34:57 -08:00
Tadashi G. Takaoka
dc2776f4c3
am 66054717
: am 875c16ad
: (-s ours) Merge "Fix long press caps lock handling (DO NOT MERGE)" into ics-mr1
...
* commit '660547172e46aa2fa59b22baee13dbddc0c84686':
Fix long press caps lock handling (DO NOT MERGE)
2011-11-17 15:15:23 -08:00
Tadashi G. Takaoka
660547172e
am 875c16ad
: (-s ours) Merge "Fix long press caps lock handling (DO NOT MERGE)" into ics-mr1
...
* commit '875c16adc3a42b156cc9f215fd6fbaa4e959a905':
Fix long press caps lock handling (DO NOT MERGE)
2011-11-17 15:12:37 -08:00
satok
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
Tadashi G. Takaoka
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
satok
bd9cf88bef
am 0a663971
: am 620b1faf
: Merge "Fix the touch calibration bug" into ics-mr1
...
* commit '0a66397106e57165ec8e27a6f868d275da9f3138':
Fix the touch calibration bug
2011-11-17 11:51:55 -08:00
satok
0a66397106
am 620b1faf
: Merge "Fix the touch calibration bug" into ics-mr1
...
* commit '620b1faf126d4b5f7cb5c353cebd374d1347fdd4':
Fix the touch calibration bug
2011-11-17 11:46:27 -08:00
Tadashi G. Takaoka
875c16adc3
Merge "Fix long press caps lock handling (DO NOT MERGE)" into ics-mr1
2011-11-17 11:18:28 -08:00
Tadashi G. Takaoka
f8a97a2552
am ac4bd598
: Merge "Fix long press caps lock handling"
...
* commit 'ac4bd598645ff0f12a59e225122ba5fc87e91e8c':
Fix long press caps lock handling
2011-11-17 11:07:18 -08:00
Tadashi G. Takaoka
ac4bd59864
Merge "Fix long press caps lock handling"
2011-11-17 11:05:51 -08:00
Tadashi G. Takaoka
5ba829ee85
am 245a4d93
: am d845c26b
: Merge "Fix IndexOutOfBoundsException in monkey test" into ics-mr1
...
* commit '245a4d930430abcc1a9ad4345ccea13c1ac697f2':
Fix IndexOutOfBoundsException in monkey test
2011-11-17 07:52:27 -08:00
Tadashi G. Takaoka
245a4d9304
am d845c26b
: Merge "Fix IndexOutOfBoundsException in monkey test" into ics-mr1
...
* commit 'd845c26b0e72e67aa14b5eac4616eb5ee7d81b33':
Fix IndexOutOfBoundsException in monkey test
2011-11-17 07:48:20 -08:00
The Android Automerger
5833ea244a
merge in ics-mr1-release history after reset to ics-mr1
2011-11-17 06:47:26 -08:00
Eric Fischer
21a97cabf3
am e9984de1
: am 6644ea82
: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit 'e9984de149a486ec722c4dae83bf67c0979abeff':
Import revised translations. DO NOT MERGE
2011-11-17 05:55:05 -08:00