aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add an option to use or not the contacts dictionary."Jean Chalard2011-06-135-4/+31
|\
| * Add an option to use or not the contacts dictionary.Jean Chalard2011-06-135-4/+31
| | | | | | | | | | Bug: 4586840 Change-Id: If62cd57e5ab661e6a51a5442d09bf0af8f08f263
* | Clean up candidate strip view hierarchyTadashi G. Takaoka2011-06-136-115/+39
| | | | | | | | | | Bug: 4175031 Change-Id: I8073739ac7624d2c0a111c5ef7043d8766162a83
* | am 89dfebe7: (-s ours) am 10aa8f12: am 9dcb764f: Fix "Show settings key" ↵Tadashi G. Takaoka2011-06-100-0/+0
|\ \ | | | | | | | | | | | | | | | | | | option on 7" device (DO NOT MERGE) * commit '89dfebe7afdb412444e238044c72e6acf8fae577': Fix "Show settings key" option on 7" device (DO NOT MERGE)
| * \ am 10aa8f12: am 9dcb764f: Fix "Show settings key" option on 7" device (DO ↵Tadashi G. Takaoka2011-06-1014-98/+242
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE) * commit '10aa8f127ae4e1f9e09f26e4e54770855ff24440': Fix "Show settings key" option on 7" device (DO NOT MERGE)
| | * \ am 9dcb764f: Fix "Show settings key" option on 7" device (DO NOT MERGE)Tadashi G. Takaoka2011-06-1014-98/+242
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '9dcb764f058fc4395c0fc207458395e9bdbdbe27': Fix "Show settings key" option on 7" device (DO NOT MERGE)
| | | * | Fix "Show settings key" option on 7" device (DO NOT MERGE)Tadashi G. Takaoka2011-06-1014-98/+242
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4590231 Change-Id: I993ac77278e129294f2bed73f97c2c4624220fdb
* | | | | am bdbefac0: am 263749f2: am 37deb112: Fix IndexOutOfBoundsExceptionTadashi G. Takaoka2011-06-101-4/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'bdbefac0b471e8a70c5d4958b8d1a345777d6bdb': Fix IndexOutOfBoundsException
| * | | | am 263749f2: am 37deb112: Fix IndexOutOfBoundsExceptionTadashi G. Takaoka2011-06-101-4/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '263749f2dc5d1cb885786afbccbb19ae6847c204': Fix IndexOutOfBoundsException
| | * | | am 37deb112: Fix IndexOutOfBoundsExceptionTadashi G. Takaoka2011-06-091-4/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '37deb112c727dfed5e94d054cf5f00f5d60c8120': Fix IndexOutOfBoundsException
| | | * | Fix IndexOutOfBoundsExceptionTadashi G. Takaoka2011-06-101-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4586181 Change-Id: I10a2d1486c9a0d11aa42cf7c6a33ecd70b6918d7
* | | | | Merge "Stop using raw e-mail addresses as names in contacts dict."Jean Chalard2011-06-101-3/+1
|\ \ \ \ \
| * | | | | Stop using raw e-mail addresses as names in contacts dict.Jean Chalard2011-06-101-3/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Bug: 4590281 Change-Id: I37016dd066efa1463077c67e05218148cbb67df4
* / | | | Demote contacts frequency.Jean Chalard2011-06-101-1/+1
|/ / / / | | | | | | | | | | | | | | | | Bug: 4586840 Change-Id: I6dbef2d973174fc49c3955547dde923d6fa48ae1
* | | | am 08c85e8a: am a2e09893: am 98275e45: Merge "Enable long press caps lock" ↵Tadashi G. Takaoka2011-06-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit '08c85e8a02f8ea369c0a9d2e1fd639df225b6230': Enable long press caps lock
| * | | am a2e09893: am 98275e45: Merge "Enable long press caps lock" into honeycomb-mr2Tadashi G. Takaoka2011-06-081-1/+1
| |\| | | | | | | | | | | | | | | | | | * commit 'a2e098934bdd729d33197fa6dcc175ac7703af86': Enable long press caps lock
| | * | am 98275e45: Merge "Enable long press caps lock" into honeycomb-mr2Tadashi G. Takaoka2011-06-081-1/+1
| | |\| | | | | | | | | | | | | | | | | * commit '98275e4512e12ca0dcee01daa6a1a3092bd11459': Enable long press caps lock
| | | * Merge "Enable long press caps lock" into honeycomb-mr2Tadashi G. Takaoka2011-06-081-1/+1
| | | |\
| | | | * Enable long press caps lockTadashi G. Takaoka2011-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is a back port from Master. Cherry-pick: I413062c759a1d91c66fcbf5dd04050dfbf15094f Bug: 3319295 Change-Id: I461942fde05d91519775d260410356dfcbe7f7c0
* | | | | am 40243e2e: (-s ours) am e64d182b: am 06f66153: Release caps lock by double ↵Tadashi G. Takaoka2011-06-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tap on shift key * commit '40243e2e46fec582f18bdc76057bd836d8e718d9': Release caps lock by double tap on shift key
| * | | | am e64d182b: am 06f66153: Release caps lock by double tap on shift keyTadashi G. Takaoka2011-06-082-5/+31
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e64d182b238c9b3e066f30a9fa1ccd8271707e38': Release caps lock by double tap on shift key
| | * | | am 06f66153: Release caps lock by double tap on shift keyTadashi G. Takaoka2011-06-082-5/+31
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '06f66153be6de88fd635ae09647fcd13a4bf04c0': Release caps lock by double tap on shift key
| | | * | Release caps lock by double tap on shift keyTadashi G. Takaoka2011-06-092-5/+31
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is a back port from Master. Cherry-pick: Ie0cad06c7b1afac0f33af76128303517e9e7bddc Bug: 3319295 Change-Id: I4bc294161cb8bc4edfdcb1afc0c66b3812667bf3
* | | | am ba6cd54a: am c636de2c: am 0ff8810b: Fix disabled mic icon temporallyTadashi G. Takaoka2011-06-093-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'ba6cd54aefe9a28e26f5668fbf43845b8c6403aa': Fix disabled mic icon temporally
| * | | am c636de2c: am 0ff8810b: Fix disabled mic icon temporallyTadashi G. Takaoka2011-06-083-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'c636de2c04838c5bd0ac9a261ac3bf4054e6c7cc': Fix disabled mic icon temporally
| | * | am 0ff8810b: Fix disabled mic icon temporallyTadashi G. Takaoka2011-06-083-0/+0
| | |\| | | | | | | | | | | | | | | | | * commit '0ff8810bff97f37a43d0ead20b718aa22bdad272': Fix disabled mic icon temporally
| | | * Fix disabled mic icon temporallyTadashi G. Takaoka2011-06-083-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround until those drawables are updated by proper image. Bug: 4562738 Change-Id: Iabdf1736fd866cf8c6d976c895c2ddda637a50dc
* | | | Merge "Enable reverting the auto-conversion of double space."Jean Chalard2011-06-081-9/+52
|\ \ \ \
| * | | | Enable reverting the auto-conversion of double space.Jean Chalard2011-06-091-9/+52
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3376923 Change-Id: If3fcfd208ad4a2b8a1452a21b07694d8d512c6ae
* | | | | Merge "Introduce CandidateView.Listener"Tadashi G. Takaoka2011-06-082-8/+16
|\ \ \ \ \
| * | | | | Introduce CandidateView.ListenerTadashi G. Takaoka2011-06-092-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4175031 Change-Id: Ie84d1c86ff099350b786c71e7081d9ea9ee0d81f
* | | | | | Fix duplicate action nextTadashi G. Takaoka2011-06-091-1/+0
| |/ / / / |/| | | | | | | | | | | | | | Change-Id: I986528131a1dbe5926b8b6b2a6ffa75f48c5151a
* | | | | Merge "Separate debug information display from candidate view"Tadashi G. Takaoka2011-06-084-97/+89
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Separate debug information display from candidate viewTadashi G. Takaoka2011-06-084-97/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is one of the preparations for suggestion strip redesign. Bug: 4175031 Change-Id: I82675936773ed6cf132a52486909ff21af828256
* | | | | Merge "Revert "move setup wizard package name to google namespace""Freeman Ng2011-06-071-1/+1
|\ \ \ \ \
| * | | | | Revert "move setup wizard package name to google namespace"Freeman Ng2011-06-071-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 1af8006352c2a3632130d6d252a1ad89ceb94303
* | | | | | Reconcile with gingerbread-releaseJean-Baptiste Queru2011-06-070-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ae917b71743cddf46bf22cd1255a7321c0ed467
| * \ \ \ \ \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-05-250-0/+0
| |\ \ \ \ \ \
* | | | | | | | Revise hasMultipleEnabledIMEsOrSubtypes()Ken Wakasa2011-06-072-1/+37
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 4559308 Change-Id: If831c0827dbf030eaf1d241ebfa60d4e5029ae63
* | | | | | | Fix NPE introduced by Ia0dc487cTadashi G. Takaoka2011-06-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4553273 Change-Id: Iaf7a969b2c96750070a296791108d67887d613e4
* | | | | | | Merge "Import 7 inch keyboard from Honeycomb-MR2"Tadashi G. Takaoka2011-06-0626-0/+2642
|\ \ \ \ \ \ \
| * | | | | | | Import 7 inch keyboard from Honeycomb-MR2Tadashi G. Takaoka2011-06-0626-0/+2642
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately current Master seems have bugs in resource selection. The xml-en/kbd_qwerty.xml is added to avoide those issue as work around, and must be removed if the issue is fixed. Bug: 4442045 Change-Id: Ic43d66e8669fb63e2c3f0b8b9aae9178ca3c32b5
* | | | | | | | Separate candidate divider from candidate viewTadashi G. Takaoka2011-06-063-17/+40
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is one of the preparations for suggestion strip redesign. Bug: 4175031 Change-Id: Ia0dc487c11c3005ef19b87ec0efcc18e48411f76
* | | | | | | am f94cc160: (-s ours) am 944e2500: am 48a00c40: Fix key label of switching ↵Tadashi G. Takaoka2011-06-030-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alphabet and symbols key (DO NOT MERGE) * commit 'f94cc1600637942afd6e21669ad976c11e14869a': Fix key label of switching alphabet and symbols key (DO NOT MERGE)
| * | | | | | am 944e2500: am 48a00c40: Fix key label of switching alphabet and symbols ↵Tadashi G. Takaoka2011-06-012-2/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key (DO NOT MERGE) * commit '944e2500e5066721ffd9967d54e134cc7385fbae': Fix key label of switching alphabet and symbols key (DO NOT MERGE)
| | * | | | | am 48a00c40: Fix key label of switching alphabet and symbols key (DO NOT MERGE)Tadashi G. Takaoka2011-06-012-2/+2
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | * commit '48a00c409d7ed709357b6d2e52dd5ba99fc89ddf': Fix key label of switching alphabet and symbols key (DO NOT MERGE)
| | | * | | | Fix key label of switching alphabet and symbols key (DO NOT MERGE)Tadashi G. Takaoka2011-06-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4499754 Change-Id: I8048b5d7e0ec90a545dac0827b699d37698bebb5
* | | | | | | am 2a0746dd: (-s ours) am 073f52a3: Merge "Keep Honeycomb-LTE in ↵Tadashi G. Takaoka2011-06-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synchronization with Honeycomb-MR2 (DO NOT MERGE)" into honeycomb-LTE * commit '2a0746dd97768f2c298adbbd7cddf381684e4f3a': Keep Honeycomb-LTE in synchronization with Honeycomb-MR2 (DO NOT MERGE)
| * | | | | | am 073f52a3: Merge "Keep Honeycomb-LTE in synchronization with Honeycomb-MR2 ↵Tadashi G. Takaoka2011-06-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (DO NOT MERGE)" into honeycomb-LTE * commit '073f52a369bfba002c1f119040e2017ab8c1c17a': Keep Honeycomb-LTE in synchronization with Honeycomb-MR2 (DO NOT MERGE)
| | * | | | | Merge "Keep Honeycomb-LTE in synchronization with Honeycomb-MR2 (DO NOT ↵Tadashi G. Takaoka2011-06-010-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | MERGE)" into honeycomb-LTE