The Android Automerger
e5e9bc0e4f
merge in gingerbread-release history after reset to gingerbread
2011-06-16 17:29:21 -07:00
Eric Fischer
e681d671fd
am 74412113: am 3a1a391e: (-s ours) am f5e20452: Import revised Croatian translations.
...
* commit '7441211339d021fac67650590fd195d6fd93b5dc':
Import revised Croatian translations.
2011-06-16 17:06:57 -07:00
Eric Fischer
7441211339
am 3a1a391e: (-s ours) am f5e20452: Import revised Croatian translations.
...
* commit '3a1a391e98edc8736f58f359e1c226339a5e6169':
Import revised Croatian translations.
2011-06-16 15:58:06 -07:00
Eric Fischer
3a1a391e98
am f5e20452: Import revised Croatian translations.
...
* commit 'f5e20452ea0742ac175f856e054eeba0d9f85dd9':
Import revised Croatian translations.
2011-06-16 15:49:05 -07:00
Eric Fischer
2e34898226
am a4c6723a: (-s ours) am 17e334f0: am 48c45512: Import revised translations. DO NOT MERGE
...
* commit 'a4c6723a035712ba7db7b53fa80c3988f7cfb110':
Import revised translations. DO NOT MERGE
2011-06-16 09:32:38 -07:00
Jean Chalard
17e44a72e8
New dict format, step 3
...
Some refactoring and add of a parameter that will be necessary.
Bug: 4392433
Change-Id: I17f001a7efd4f69f4c35f94ee1ca8e97391b81d5
2011-06-16 23:28:09 +09:00
Jean Chalard
8124e64dcc
New dict format, step 2
...
Move some methods around and make static some methods
Bug: 4392433
Change-Id: I2bbe98aec118a416d21d1e293638e1d324505b9b
2011-06-16 22:33:41 +09:00
Jean Chalard
3f4385511b
Merge "New dict format, step 1"
2011-06-16 06:18:56 -07:00
Jean Chalard
293ece0f34
New dict format, step 1
...
This renames some variables and removes dependancies to values that
will disappear
Bug: 4392433
Change-Id: I79a44462d6bf25248cc2de0d63d7918fc6925d68
2011-06-16 22:18:10 +09:00
Tadashi G. Takaoka
4b1c759c77
Merge "Add Key.keyHintLabel and remove Key.keyHintIcon"
2011-06-16 05:24:49 -07:00
Tadashi G. Takaoka
9d9522abdc
Add Key.keyHintLabel and remove Key.keyHintIcon
...
This change also removes manualTemporaryUpperCaseCode and
manualTemporaryUpperCaseHintIcon. Instead of these keyLabelOption now
has hasUppercaseLetter flag value.
Bug: 4436327
Change-Id: I88fdac1e888a7123735296f5ef45f5fdd565cd2e
2011-06-16 21:24:19 +09:00
Jean Chalard
f844094e83
Merge "Small performance fix."
2011-06-16 04:29:21 -07:00
Tadashi G. Takaoka
a61967330e
Make LatinKeyboard aware of theme
...
Bug: 4436327
Change-Id: Idecdd470cbb0720b96958039eb11f6978d39629e
2011-06-16 20:10:49 +09:00
Jean Chalard
516f18f97e
Small performance fix.
...
This improves performance by not allocating an iterator.
Change-Id: I5511fd8b8d3aa826917620c0af994dbaf1562bb1
2011-06-16 20:05:46 +09:00
Eric Fischer
a4c6723a03
am 17e334f0: am 48c45512: Import revised translations. DO NOT MERGE
...
* commit '17e334f062fe73350442248ae8e988d133cfd50c':
Import revised translations. DO NOT MERGE
2011-06-15 16:51:19 -07:00
Eric Fischer
17e334f062
am 48c45512: Import revised translations. DO NOT MERGE
...
* commit '48c4551246d02ae836f09bf11033bc7fa840fb57':
Import revised translations. DO NOT MERGE
2011-06-15 16:47:06 -07:00
Eric Fischer
48c4551246
Import revised translations. DO NOT MERGE
...
Change-Id: Ia5cfe42d769c1a42ba8f58bfd199808d44fdaba2
2011-06-15 15:15:17 -07:00
Eric Fischer
f5e20452ea
Import revised Croatian translations.
...
Change-Id: I1949298b51b25d234ce11ea7a93c4ac17dde4a36
2011-06-15 12:09:33 -07:00
Tadashi G. Takaoka
08a6f2aea7
Make CandidateView aware of theme
...
This change is needed to introduce new theme easily.
Bug: 4436327
Change-Id: Idc368b66d892d9c888ba7a26bfa3527c21678292
2011-06-15 20:02:45 +09:00
Tadashi G. Takaoka
66bafe24f6
Merge "Make Keyboard aware of theme"
2011-06-15 03:56:26 -07:00
Tadashi G. Takaoka
b7758d6f91
Make Keyboard aware of theme
...
This change is needed to introduce new theme easily. As a starter this
change introduces Keyboard.popupHintIcon attribute and
Key.keyLabelOption.popupHint flag to show popup hint icon that is
previously specified by Key.keyHintIcon attribute.
Bug: 4436327
Change-Id: I6b1c5c1b88eece541141b2d2cedd164ee02e5c2a
2011-06-15 19:51:30 +09:00
satok
e968ad8ad1
Merge "Remove the original text from SuggestionSpan"
2011-06-15 02:43:03 -07:00
satok
064e21bb1d
Remove the original text from SuggestionSpan
...
Change-Id: If70d32cad980b46ba77f399606d7ab3957c5d096
2011-06-15 18:32:07 +09:00
Tadashi G. Takaoka
1ddb4897fe
Fix Keyboard crash when chording and long pressing key
...
This change just prevents crashing. The another bug#4646271 has been
opened to support chording and long pressing key.
Bug: 4463909
Change-Id: I50e42656fe111e6b261310c899e672b8ba001e5d
2011-06-15 17:05:39 +09:00
Tadashi G. Takaoka
862e05a8f0
Fix NPE in CandidateView.offsetMargin
...
Bug: 4609124
Change-Id: I14913afba80732e6beb8458b404001798a221a79
2011-06-15 10:48:53 +09:00
Tadashi G. Takaoka
86e815a142
Implement expandable candidates pane
...
This change removes horizontal scroll from candidates strip. Instead
of that this change introduces "fixed 3 items candidates strip" and
"expandable candidates pane".
Bug: 4175031
Change-Id: Ia367d9074436fdea76d3b653d81798ce2749170e
2011-06-14 20:40:56 +09:00
Jean Chalard
90cb2e6296
Merge "Add an option to use or not the contacts dictionary."
2011-06-13 01:48:00 -07:00
Jean Chalard
699094f9b6
Add an option to use or not the contacts dictionary.
...
Bug: 4586840
Change-Id: If62cd57e5ab661e6a51a5442d09bf0af8f08f263
2011-06-13 17:33:04 +09:00
Tadashi G. Takaoka
070760dc5a
Clean up candidate strip view hierarchy
...
Bug: 4175031
Change-Id: I8073739ac7624d2c0a111c5ef7043d8766162a83
2011-06-13 15:12:23 +09:00
Tadashi G. Takaoka
2a29e4ae54
am 89dfebe7: (-s ours) am 10aa8f12: am 9dcb764f: Fix "Show settings key" option on 7" device (DO NOT MERGE)
...
* commit '89dfebe7afdb412444e238044c72e6acf8fae577':
Fix "Show settings key" option on 7" device (DO NOT MERGE)
2011-06-10 15:23:55 -07:00
Tadashi G. Takaoka
89dfebe7af
am 10aa8f12: am 9dcb764f: Fix "Show settings key" option on 7" device (DO NOT MERGE)
...
* commit '10aa8f127ae4e1f9e09f26e4e54770855ff24440':
Fix "Show settings key" option on 7" device (DO NOT MERGE)
2011-06-10 15:20:52 -07:00
Tadashi G. Takaoka
10aa8f127a
am 9dcb764f: Fix "Show settings key" option on 7" device (DO NOT MERGE)
...
* commit '9dcb764f058fc4395c0fc207458395e9bdbdbe27':
Fix "Show settings key" option on 7" device (DO NOT MERGE)
2011-06-10 15:16:50 -07:00
Tadashi G. Takaoka
8d828fc449
am bdbefac0: am 263749f2: am 37deb112: Fix IndexOutOfBoundsException
...
* commit 'bdbefac0b471e8a70c5d4958b8d1a345777d6bdb':
Fix IndexOutOfBoundsException
2011-06-10 15:11:13 -07:00
Tadashi G. Takaoka
bdbefac0b4
am 263749f2: am 37deb112: Fix IndexOutOfBoundsException
...
* commit '263749f2dc5d1cb885786afbccbb19ae6847c204':
Fix IndexOutOfBoundsException
2011-06-10 07:46:48 -07:00
Tadashi G. Takaoka
9dcb764f05
Fix "Show settings key" option on 7" device (DO NOT MERGE)
...
Bug: 4590231
Change-Id: I993ac77278e129294f2bed73f97c2c4624220fdb
2011-06-10 19:30:37 +09:00
Jean Chalard
35daf4007c
Merge "Stop using raw e-mail addresses as names in contacts dict."
2011-06-10 02:34:05 -07:00
Jean Chalard
1ea78d92e6
Stop using raw e-mail addresses as names in contacts dict.
...
Bug: 4590281
Change-Id: I37016dd066efa1463077c67e05218148cbb67df4
2011-06-10 18:18:05 +09:00
Jean Chalard
dc05c6650e
Demote contacts frequency.
...
Bug: 4586840
Change-Id: I6dbef2d973174fc49c3955547dde923d6fa48ae1
2011-06-10 17:36:12 +09:00
Tadashi G. Takaoka
601b72cb1e
am 08c85e8a: am a2e09893: am 98275e45: Merge "Enable long press caps lock" into honeycomb-mr2
...
* commit '08c85e8a02f8ea369c0a9d2e1fd639df225b6230':
Enable long press caps lock
2011-06-09 18:55:34 -07:00
Tadashi G. Takaoka
da8cea98fe
am 40243e2e: (-s ours) am e64d182b: am 06f66153: Release caps lock by double tap on shift key
...
* commit '40243e2e46fec582f18bdc76057bd836d8e718d9':
Release caps lock by double tap on shift key
2011-06-09 18:55:30 -07:00
Tadashi G. Takaoka
263749f2dc
am 37deb112: Fix IndexOutOfBoundsException
...
* commit '37deb112c727dfed5e94d054cf5f00f5d60c8120':
Fix IndexOutOfBoundsException
2011-06-09 18:26:56 -07:00
Tadashi G. Takaoka
37deb112c7
Fix IndexOutOfBoundsException
...
Bug: 4586181
Change-Id: I10a2d1486c9a0d11aa42cf7c6a33ecd70b6918d7
2011-06-10 09:57:32 +09:00
Tadashi G. Takaoka
430dc5957e
am ba6cd54a: am c636de2c: am 0ff8810b: Fix disabled mic icon temporally
...
* commit 'ba6cd54aefe9a28e26f5668fbf43845b8c6403aa':
Fix disabled mic icon temporally
2011-06-09 11:52:27 -07:00
Tadashi G. Takaoka
08c85e8a02
am a2e09893: am 98275e45: Merge "Enable long press caps lock" into honeycomb-mr2
...
* commit 'a2e098934bdd729d33197fa6dcc175ac7703af86':
Enable long press caps lock
2011-06-08 23:04:40 -07:00
Tadashi G. Takaoka
a2e098934b
am 98275e45: Merge "Enable long press caps lock" into honeycomb-mr2
...
* commit '98275e4512e12ca0dcee01daa6a1a3092bd11459':
Enable long press caps lock
2011-06-08 23:02:48 -07:00
Tadashi G. Takaoka
98275e4512
Merge "Enable long press caps lock" into honeycomb-mr2
2011-06-08 23:01:46 -07:00
Tadashi G. Takaoka
40243e2e46
am e64d182b: am 06f66153: Release caps lock by double tap on shift key
...
* commit 'e64d182b238c9b3e066f30a9fa1ccd8271707e38':
Release caps lock by double tap on shift key
2011-06-08 23:00:52 -07:00
Tadashi G. Takaoka
e64d182b23
am 06f66153: Release caps lock by double tap on shift key
...
* commit '06f66153be6de88fd635ae09647fcd13a4bf04c0':
Release caps lock by double tap on shift key
2011-06-08 22:59:14 -07:00
Tadashi G. Takaoka
7dd37ef267
Enable long press caps lock
...
This change is a back port from Master.
Cherry-pick: I413062c759a1d91c66fcbf5dd04050dfbf15094f
Bug: 3319295
Change-Id: I461942fde05d91519775d260410356dfcbe7f7c0
2011-06-09 14:54:57 +09:00
Tadashi G. Takaoka
06f66153be
Release caps lock by double tap on shift key
...
This change is a back port from Master.
Cherry-pick: Ie0cad06c7b1afac0f33af76128303517e9e7bddc
Bug: 3319295
Change-Id: I4bc294161cb8bc4edfdcb1afc0c66b3812667bf3
2011-06-09 14:53:52 +09:00