918a54dda1
merge in ics-mr1-release history after reset to ics-mr1
2011-11-28 12:23:15 -08:00
c1f7d39b4a
Introduce ignoreWhileTyping flags to Key.keyActionFlags
...
Bug: 5639503
Change-Id: Ic2afad6766edb2538a58f722209e2daa40aa488d
2011-11-22 18:18:29 -08:00
adb89c109e
Merge "Move ignore special key code out from LatinIME to PointerTracker"
2011-11-22 17:57:59 -08:00
9324665263
Move ignore special key code out from LatinIME to PointerTracker
...
Bug: 5560766
Bug: 5639503
Change-Id: I34c9eea833516adf6ef1db58f1a64a5ef5322fa9
2011-11-22 17:49:12 -08:00
3b82e8163c
Merge "Fixed typing uppercase letters when touch exploration is enabled."
2011-11-22 14:57:59 -08:00
f7ef21d45c
Reconcile with ics-mr1-release
...
Change-Id: I0297a6573eef4419224117618fefe72984d68a42
2011-11-22 13:26:29 -08:00
e4678673f7
merge in ics-mr1-release history after reset to ics-mr1
2011-11-22 11:57:03 -08:00
6d1cbbc2ff
Fix a bug with single quotes
...
I14dd3815 special-cased single quotes at the start of a word, but
did not do so correctly - it would kill a composing word if entered
just after some punctuations.
The right test was not isCursorTouchingWord() but
mHasUncommittedTypedChars, which actually makes for a simpler
implementation.
Bug: 5648032
Change-Id: Icd21d213e0cad6da68cacfeb921502cd8dcfac95
2011-11-22 18:29:51 +09:00
f3afe5ed0a
am c053af1e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit 'c053af1e0caf2f7e6572b1196283b7433cddf678':
Import revised translations. DO NOT MERGE
2011-11-21 21:07:57 -08:00
13d5f6605b
Add Key.keyActionFlags and obsolete Key.isRepeatable
...
This change also renames Key.keyLabelOption to keyLabelFlags.
Change-Id: Iedd0bfaa420ad382c07ce084416355690e390919
2011-11-21 20:33:03 -08:00
e87fd4d282
Fixed typing uppercase letters when touch exploration is enabled.
...
Bug: 5652774
Change-Id: Id8cd37b3ff93b45f4f18198bbbb827aadf945b02
2011-11-21 17:56:03 -08:00
e7eac906c0
Pending onStartInputView only if the EditorInfo is identical
...
Bug: 5604372
Change-Id: I2a88cf15b07eebd29e43e460f6ec758432181b01
2011-11-21 16:32:46 -08:00
c053af1e0c
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-21 15:23:04 -08:00
3342c6beaa
Import revised translations. DO NOT MERGE
...
Change-Id: I3dd6c61ed17bfd845d5b3954c194b26970f3e7c2
2011-11-21 15:03:13 -08:00
19cbdfc92f
Merge "Remove an unused (and scary) method"
2011-11-21 00:57:45 -08:00
ce86e39e00
Merge "Cleanup."
2011-11-21 00:53:49 -08:00
5d5028f2c5
Remove an unused (and scary) method
...
Change-Id: I14a545a3e4955a25fde17554156552c755d44e2f
2011-11-21 17:45:32 +09:00
6ecd1e1280
Merge "Special case quotes at start and end of words"
2011-11-21 00:21:09 -08:00
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
0e4275730b
Tweak number and phone keyboard layout of tablet
...
Change-Id: Icb2f146becb7f834adba2612c9420a8f2d1e87fc
2011-11-18 17:27:55 -08:00
0be36ee096
Add left/right padding to phone/number layout of tablet
...
Change-Id: Ida6b458f3233cd4ea3ae71e07e2a5c80c7750954
2011-11-18 17:19:58 -08:00
b98578ed0b
Copy number/phone keyboard layout of tablet
...
Change-Id: I63e576ea88db313ede89f2517436071f5c391204
2011-11-18 17:16:15 -08:00
f3dfa55029
Merge "Introduce noKeyPreview Key attribute"
2011-11-18 16:28:54 -08:00
b0700a342e
Reconcile with ics-mr1-release
...
Change-Id: I0d6cb047da185ed18a4cb859a8c7c7585aa91930
2011-11-18 15:43:42 -08:00
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
5dc318a3f2
am 10dff768: Fix NPE introduced by I38b21d49
...
* commit '10dff76856a98b6eec86a53d3d07fdc9708037b7':
Fix NPE introduced by I38b21d49
2011-11-18 14:48:05 -08:00
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
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
49cc3beb75
resolved conflicts for merge of 137667ed to master
...
Change-Id: I75fc5d278b002ab89dd2475d282d0ee4aede7817
2011-11-18 08:51:39 -08:00
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
5619d76584
Shift/Symbol/Smiley will not disable settings/microphone keys
...
Bug: 5560766
Change-Id: Ic2dbb835e87a7debb222093756816e683b464b83
2011-11-17 23:32:19 -08:00
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
10dff76856
Fix NPE introduced by I38b21d49
...
Bug: 5560766
Change-Id: Ic5eaebe0ef893c69ad90a777ebfa07807535a0e3
2011-11-17 21:46:24 -08:00
15a01d7272
Merge "Do not show key preview of settings and shortcut key" into ics-mr1
2011-11-17 18:02:05 -08:00
137667ed3d
Merge "Ignore microphone and settings key while typing" into ics-mr1
2011-11-17 18:01:43 -08:00
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
175acb8205
Ignore microphone and settings key while typing
...
Bug: 5560766
Change-Id: I38b21d49b7e803bf94805ba8e13849b3c734e010
2011-11-17 16:01:31 -08:00
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
ca14c8bf34
Do not show key preview of settings and shortcut key
...
Bug: 5560766
Change-Id: I580efaf4e33f7dfbaa591e2afae9c49547bf26fb
2011-11-17 15:34:57 -08:00
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
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
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
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
875c16adc3
Merge "Fix long press caps lock handling (DO NOT MERGE)" into ics-mr1
2011-11-17 11:18:28 -08:00
ac4bd59864
Merge "Fix long press caps lock handling"
2011-11-17 11:05:51 -08:00
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
5833ea244a
merge in ics-mr1-release history after reset to ics-mr1
2011-11-17 06:47:26 -08:00
e9984de149
am 6644ea82: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '6644ea82970da35897b40ef524406b1e3b0d0a9d':
Import revised translations. DO NOT MERGE
2011-11-17 05:46:23 -08:00
6e8f277aab
am 0993a89b: am 1c0f94c5: Reconcile with ics-factoryrom-2-release
...
* commit '0993a89b31eea938b72b925d078f5c68322885f8':
2011-11-17 04:08:35 -08:00
4c1dfc62c8
Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3
...
Bug: 5629373
Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
2011-11-17 16:34:05 +09:00
The Android Automerger
Tadashi G. Takaoka
Svetoslav Ganov
The Android Open Source Project
Jean Chalard
Eric Fischer
Alan Viverette
satok