aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge "Long pressing mic/comma key will show settings menue" into gingerbreadTadashi G. Takaoka2010-09-302-10/+21
| | |\
| | | * Long pressing mic/comma key will show settings menueTadashi G. Takaoka2010-09-302-10/+21
| | | | | | | | | | | | | | | | | | | | Bug: 3050703 Change-Id: I62773c10f435d13174f6ff6574912cb99303e83c
* | | | am 93176d86: am 77c9f2d3: Merge "Display feedback popup for saving word ↵Tadashi G. Takaoka2010-09-301-37/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while the word is pressing." into gingerbread Merge commit '93176d869a496051344d80ef03573bc6bb99035a' * commit '93176d869a496051344d80ef03573bc6bb99035a': Display feedback popup for saving word while the word is pressing.
| * | | am 77c9f2d3: Merge "Display feedback popup for saving word while the word is ↵Tadashi G. Takaoka2010-09-301-37/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pressing." into gingerbread Merge commit '77c9f2d314d9fbb5c4bd5b6918326d2e1f4e3a98' into gingerbread-plus-aosp * commit '77c9f2d314d9fbb5c4bd5b6918326d2e1f4e3a98': Display feedback popup for saving word while the word is pressing.
| | * | Merge "Display feedback popup for saving word while the word is pressing." ↵Tadashi G. Takaoka2010-09-301-37/+3
| | |\ \ | | | | | | | | | | | | | | | into gingerbread
| | | * | Display feedback popup for saving word while the word is pressing.Tadashi G. Takaoka2010-09-301-37/+3
| | | |/ | | | | | | | | | | | | | | | | Bug: 3004696 Change-Id: Icc5bdd6945f3bf79f7234a0227d8036d6f6d4c1d
* | | | am b97d1777: am 36f97dd6: Fixed assets - Make the background of popup key a ↵satok2010-09-302-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full transparent color - Updated the background mdpi asset of keyboard Merge commit 'b97d17777ef2d8550770a48c84e51e4548820812' * commit 'b97d17777ef2d8550770a48c84e51e4548820812': Fixed assets
| * | | am 36f97dd6: Fixed assets - Make the background of popup key a full ↵satok2010-09-302-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transparent color - Updated the background mdpi asset of keyboard Merge commit '36f97dd6897b17841c1e6aab4612f3905185a90c' into gingerbread-plus-aosp * commit '36f97dd6897b17841c1e6aab4612f3905185a90c': Fixed assets
| | * | Fixed assetssatok2010-09-302-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make the background of popup key a full transparent color - Updated the background mdpi asset of keyboard Bug: 2975027 Bug: 3048638 Change-Id: I8709a1ca403e5c3f862a8be9be1668d30c7687f8
* | | am e6e45510: am 11a578f4: Disable suggestion bar before invoke Voice inputTadashi G. Takaoka2010-09-301-0/+3
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'e6e45510674b31d0c82fa5f8a7943668d7e8503a' * commit 'e6e45510674b31d0c82fa5f8a7943668d7e8503a': Disable suggestion bar before invoke Voice input
| * | am 11a578f4: Disable suggestion bar before invoke Voice inputTadashi G. Takaoka2010-09-301-0/+3
| |\| | | | | | | | | | | | | | | | | | | Merge commit '11a578f4f130ebae66fb1bd9953874f421c3c09c' into gingerbread-plus-aosp * commit '11a578f4f130ebae66fb1bd9953874f421c3c09c': Disable suggestion bar before invoke Voice input
| | * Disable suggestion bar before invoke Voice inputTadashi G. Takaoka2010-09-301-0/+3
| | | | | | | | | | | | | | | Bug: 3002817 Change-Id: I099dd63e58d5159a609c1d934dbb6f5aab914305
* | | am 48ef72ac: am 8ff96805: Merge "Eliminate compiler warning" into gingerbreadTadashi G. Takaoka2010-09-301-2/+1
|\| | | | | | | | | | | | | | | | | | | | Merge commit '48ef72acef92bb774bad84d647427eaab0acc83b' * commit '48ef72acef92bb774bad84d647427eaab0acc83b': Eliminate compiler warning
| * | am 8ff96805: Merge "Eliminate compiler warning" into gingerbreadTadashi G. Takaoka2010-09-301-2/+1
| |\| | | | | | | | | | | | | | | | | | | Merge commit '8ff9680522c096ef76fbe087e50f04d76c172173' into gingerbread-plus-aosp * commit '8ff9680522c096ef76fbe087e50f04d76c172173': Eliminate compiler warning
| | * Merge "Eliminate compiler warning" into gingerbreadTadashi G. Takaoka2010-09-291-2/+1
| | |\
| | | * Eliminate compiler warningTadashi G. Takaoka2010-09-301-2/+1
| | | | | | | | | | | | | | | | Change-Id: Ib3effaa6f4e8cfc3951ab5d5d099335fd3856a2f
* | | | am 259778c3: am eebe37e8: Merge "Disable suggestion selection preview popup" ↵Tadashi G. Takaoka2010-09-301-49/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '259778c3a18246b3117c2874b87f1adaf2d9fb81' * commit '259778c3a18246b3117c2874b87f1adaf2d9fb81': Disable suggestion selection preview popup
| * | | am eebe37e8: Merge "Disable suggestion selection preview popup" into gingerbreadTadashi G. Takaoka2010-09-301-49/+56
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'eebe37e83695e2542cb71fd81b244e1949ca8522' into gingerbread-plus-aosp * commit 'eebe37e83695e2542cb71fd81b244e1949ca8522': Disable suggestion selection preview popup
| | * | Merge "Disable suggestion selection preview popup" into gingerbreadTadashi G. Takaoka2010-09-291-49/+56
| | |\ \ | | | |/ | | |/|
| | | * Disable suggestion selection preview popupTadashi G. Takaoka2010-09-301-49/+56
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 3048642 Bug: 3004920 Change-Id: Ibfb495a246c9e2da6ebf3c03d10ed8acff00f54b
* | | | am 7d849f8a: am 2d6a0c68: Merge "Fix proguard flag file dependency." into ↵Ying Wang2010-09-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '7d849f8a2aeadb5b8a97b42fe5748dced3051126' * commit '7d849f8a2aeadb5b8a97b42fe5748dced3051126': Fix proguard flag file dependency.
| * | | am 2d6a0c68: Merge "Fix proguard flag file dependency." into gingerbreadYing Wang2010-09-301-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2d6a0c68c29c94b492a93d06d072568d767c1e72' into gingerbread-plus-aosp * commit '2d6a0c68c29c94b492a93d06d072568d767c1e72': Fix proguard flag file dependency.
| | * | Merge "Fix proguard flag file dependency." into gingerbreadYing Wang2010-09-291-1/+1
| | |\ \
| | | * | Fix proguard flag file dependency.Ying Wang2010-09-291-1/+1
| | | |/ | | | | | | | | | | | | Change-Id: I26a639aea0e0b11ba65d621696c42e861847498e
* | | | am 4d158dc2: am 15b840cd: Merge "Check recorrection on focusing into a text ↵Amith Yamasani2010-09-301-0/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | field that has text already." into gingerbread Merge commit '4d158dc2779ffff8c92a41f32e6885bd0f155fc3' * commit '4d158dc2779ffff8c92a41f32e6885bd0f155fc3': Check recorrection on focusing into a text field that has text already.
| * | | am 15b840cd: Merge "Check recorrection on focusing into a text field that ↵Amith Yamasani2010-09-291-0/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has text already." into gingerbread Merge commit '15b840cd48184fc33b294c15eaaf28ac05393a43' into gingerbread-plus-aosp * commit '15b840cd48184fc33b294c15eaaf28ac05393a43': Check recorrection on focusing into a text field that has text already.
| | * | Merge "Check recorrection on focusing into a text field that has text ↵Amith Yamasani2010-09-291-0/+23
| | |\ \ | | | |/ | | |/| | | | | already." into gingerbread
| | | * Check recorrection on focusing into a text field that has text already.Amith Yamasani2010-09-291-0/+23
| | | | | | | | | | | | | | | | | | | | Bug: 3004827 Change-Id: I00e9d925fcf17fa9f7a9aefe6572a648e023be11
* | | | resolved conflicts for merge of ab1348e8 to masterTadashi G. Takaoka2010-09-302-110/+77
|\| | | | | | | | | | | | | | | Change-Id: Ica94a5f9ac4feae477297f14fc1bc21d02efb6a4
| * | | am 179ada95: Refactor CandidateView touch event handlingTadashi G. Takaoka2010-09-292-110/+77
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '179ada958b0bb46c6b9c8eb8b220d84dd3db855a' into gingerbread-plus-aosp * commit '179ada958b0bb46c6b9c8eb8b220d84dd3db855a': Refactor CandidateView touch event handling
| | * | Refactor CandidateView touch event handlingTadashi G. Takaoka2010-09-292-110/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also fixes tha the touch slop value is applyed only for initial movement of scrolling suggestion bar. Bug: 3004920 Change-Id: I62afdedc210156e41e8c84c48cade442f9d5a1aa
* | | | am fcd5f2b9: am c2c9cd82: Merge "Mini keyboard works even while shift is ↵Tadashi G. Takaoka2010-09-282-5/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being pressed" into gingerbread Merge commit 'fcd5f2b9b4229c00a6589aad1fda9b727759d343' * commit 'fcd5f2b9b4229c00a6589aad1fda9b727759d343': Mini keyboard works even while shift is being pressed
| * | | am c2c9cd82: Merge "Mini keyboard works even while shift is being pressed" ↵Tadashi G. Takaoka2010-09-282-5/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'c2c9cd82da81f87aeb81675bbae6b76bac3b83ca' into gingerbread-plus-aosp * commit 'c2c9cd82da81f87aeb81675bbae6b76bac3b83ca': Mini keyboard works even while shift is being pressed
| | * | Merge "Mini keyboard works even while shift is being pressed" into gingerbreadTadashi G. Takaoka2010-09-282-5/+14
| | |\ \
| | | * | Mini keyboard works even while shift is being pressedTadashi G. Takaoka2010-09-292-5/+14
| | | |/ | | | | | | | | | | | | | | | | Bug: 3038861 Change-Id: I94011ca80710ff6eb24e940104f7d9d3bb86840a
* | | | resolved conflicts for merge of 0325360d to masterTadashi G. Takaoka2010-09-294-4/+12
|\| | | | | | | | | | | | | | | Change-Id: I5926c8d75dbffda20001fa9487fae2e5f723c755
| * | | am 46941882: Tune mini keyboard vertical correction to match with key heightTadashi G. Takaoka2010-09-283-3/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '46941882b2c3f7467ce3d77be6948cfa7aafe548' into gingerbread-plus-aosp * commit '46941882b2c3f7467ce3d77be6948cfa7aafe548': Tune mini keyboard vertical correction to match with key height
| | * | Tune mini keyboard vertical correction to match with key heightTadashi G. Takaoka2010-09-293-3/+7
| | |/ | | | | | | | | | | | | Bug: 3040529 Change-Id: I8e3cc635737224537a019e66c38e1e2ea7a8bb8b
* | | am 0ea7e504: am 6e5a3986: Fixed key code and key coordinates when move ↵Tadashi G. Takaoka2010-09-281-119/+129
|\| | | | | | | | | | | | | | | | | | | | | | | | | | debounce has been in action Merge commit '0ea7e504887702bace7b2e765704d08e737ab1b5' * commit '0ea7e504887702bace7b2e765704d08e737ab1b5': Fixed key code and key coordinates when move debounce has been in action
| * | am 6e5a3986: Fixed key code and key coordinates when move debounce has been ↵Tadashi G. Takaoka2010-09-281-119/+129
| |\| | | | | | | | | | | | | | | | | | | | | | | | | in action Merge commit '6e5a3986854549a45c95770b5a88ae5577e93299' into gingerbread-plus-aosp * commit '6e5a3986854549a45c95770b5a88ae5577e93299': Fixed key code and key coordinates when move debounce has been in action
| | * Fixed key code and key coordinates when move debounce has been in actionTadashi G. Takaoka2010-09-281-119/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change refactors a key index and pointer position variables into a separate static inner class KeyState . This change also disables time debouncing. Bug: 3033737 Change-Id: Ie4fc37316c260330d8f0861e0771ea903a99cfce
* | | am ad090ac3: am 008e9b3e: Fix Null pointer exception on closing and update ↵satok2010-09-288-3/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | assets Merge commit 'ad090ac3f4cee327adf74e8b35bbc446a8d64070' * commit 'ad090ac3f4cee327adf74e8b35bbc446a8d64070': Fix Null pointer exception on closing and update assets
| * | am 008e9b3e: Fix Null pointer exception on closing and update assetssatok2010-09-288-3/+8
| |\| | | | | | | | | | | | | | | | | | | Merge commit '008e9b3e1a8c037e0275b19f284a7d2e76c9e140' into gingerbread-plus-aosp * commit '008e9b3e1a8c037e0275b19f284a7d2e76c9e140': Fix Null pointer exception on closing and update assets
| | * Fix Null pointer exception on closing and update assetssatok2010-09-288-3/+8
| | | | | | | | | | | | Change-Id: I30fdac74685beae06b5c61140452b26b29ae4c39
* | | Fix xlarge min-keyboard layoutTadashi G. Takaoka2010-09-286-6/+38
| | | | | | | | | | | | Change-Id: Ia4d6cffa0c6cf710da577b75f6337836352959a0
* | | Fix wrong keyEdgeFlags in xlarge keyboard layoutsTadashi G. Takaoka2010-09-283-25/+20
| | | | | | | | | | | | | | | Bug: 3040988 Change-Id: Ibcac874a96ed0bf35350b50a5dd862a8d03c8354
* | | Fix NPE in LatinKeyboard when it represent phone keyboardTadashi G. Takaoka2010-09-281-9/+13
| | | | | | | | | | | | | | | Bug: 3041532 Change-Id: I1d846e9175bd033f056a8715287a936be2fe8f74
* | | Merge "Fix the non-working period key in the tablet layout."Amith Yamasani2010-09-271-1/+1
|\ \ \
| * | | Fix the non-working period key in the tablet layout.Amith Yamasani2010-09-271-1/+1
| | | | | | | | | | | | | | | | One of the edge flags was wrong.
* | | | am 5f1aecb2: (-s ours) am e07bc39a: Merge "Trim unwanted whitespace from ↵Eric Fischer2010-09-270-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | translations. DO NOT MERGE" into gingerbread Merge commit '5f1aecb27d008803def36efeba9d2503035c1ac4' * commit '5f1aecb27d008803def36efeba9d2503035c1ac4': Trim unwanted whitespace from translations. DO NOT MERGE