aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am 2e680c89: Merge "Trigger the set action when pressing hardware enter (C2)"Jean Chalard2013-01-181-6/+13
|\ | | | | | | | | * commit '2e680c890d198f2f32d4ae1a46b0431b61227db2': Trigger the set action when pressing hardware enter (C2)
| * Merge "Trigger the set action when pressing hardware enter (C2)"Jean Chalard2013-01-181-6/+13
| |\
| | * Trigger the set action when pressing hardware enter (C2)Jean Chalard2013-01-181-6/+13
| | | | | | | | | | | | | | | Bug: 7969231 Change-Id: I581212093df6f16fa9304e0b3e5b46714a7acdb3
* | | am d5e869ce: Merge "Track handled events to consistently return handled ↵Jean Chalard2013-01-181-1/+12
|\| | | | | | | | | | | | | | | | | | | | status (C1)" * commit 'd5e869ced838454ede1d813d6a289fafc31b0665': Track handled events to consistently return handled status (C1)
| * | Merge "Track handled events to consistently return handled status (C1)"Jean Chalard2013-01-181-1/+12
| |\|
| | * Track handled events to consistently return handled status (C1)Jean Chalard2013-01-181-1/+12
| | | | | | | | | | | | | | | Bug: 5037589 Change-Id: I92d5be669420f0b2fdeb8fcf85aefd3961bf84b4
| * | Merge "Correct GesturePreviewTrail.getWidth() implementation"Tadashi G. Takaoka2013-01-182-4/+2
| |\ \
| | * | Correct GesturePreviewTrail.getWidth() implementationTadashi G. Takaoka2013-01-182-4/+2
| | | | | | | | | | | | | | | | | | | | Bug: 7981153 Change-Id: I20785b7f82329ce6f19c883e77a9716772cda290
| * | | Merge "Add SeekBarDialogPreference"Tadashi G. Takaoka2013-01-188-333/+191
| |\ \ \
| | * | | Add SeekBarDialogPreferenceTadashi G. Takaoka2013-01-188-333/+191
| | |/ / | | | | | | | | | | | | | | | | | | | | This change removes SeekBarDialog class. Change-Id: I437b1e554a5af264b8031ebe05b8250a831c8d3b
* | | | Add SeekBarDialogPreferenceTadashi G. Takaoka2013-01-188-333/+191
| | | | | | | | | | | | | | | | | | | | | | | | This change removes SeekBarDialog class. Change-Id: I437b1e554a5af264b8031ebe05b8250a831c8d3b
* | | | Correct GesturePreviewTrail.getWidth() implementationTadashi G. Takaoka2013-01-182-4/+2
| | | | | | | | | | | | | | | | | | | | Bug: 7981153 Change-Id: I20785b7f82329ce6f19c883e77a9716772cda290
* | | | am 41afa87a: Merge "Remove automatic switch back to alphabet feature"Tadashi G. Takaoka2013-01-183-47/+20
|\| | | | | | | | | | | | | | | | | | | * commit '41afa87a72fab4f7f328569f5ebe86d2b6127641': Remove automatic switch back to alphabet feature
| * | | Merge "Remove automatic switch back to alphabet feature"Tadashi G. Takaoka2013-01-183-47/+20
| |\ \ \
| | * | | Remove automatic switch back to alphabet featureTadashi G. Takaoka2013-01-183-47/+20
| | |/ / | | | | | | | | | | | | Change-Id: I4600c808f2ec31c18d3698a43afa7f4be9407e3e
* | | | am 81a4b7f4: Merge "Fix a bug in gesture after a dash or apostrophe"Jean Chalard2013-01-181-3/+12
|\| | | | | | | | | | | | | | | | | | | * commit '81a4b7f48e0649c1b984fd25398f45ce813f7cbf': Fix a bug in gesture after a dash or apostrophe
| * | | Merge "Fix a bug in gesture after a dash or apostrophe"Jean Chalard2013-01-181-3/+12
| |\ \ \
| | * | | Fix a bug in gesture after a dash or apostropheJean Chalard2013-01-181-3/+12
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It would insert a space when it shouldn't when composing a word ending in either dash or apostrophe and gesturing right away. Bug: 7889078 Change-Id: Ib3e2f6f5e551888cc081b464a641e2deac6f5ef7
* | | | am 889a5e14: Merge "Reset forgotten members (D3)"Jean Chalard2013-01-171-0/+2
|\| | | | | | | | | | | | | | | | | | | * commit '889a5e1430a87ae5dc2c0e537b3f09462e081cc9': Reset forgotten members (D3)
| * | | Merge "Reset forgotten members (D3)"Jean Chalard2013-01-181-0/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Reset forgotten members (D3)Jean Chalard2013-01-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only resetting mCapitalizedMode is enough to fix bug#8013488, but we may as well correctly reset both fields. Bug: 8013488 Change-Id: Icb0d7c5b1e93368e8eb7848aa9137b45d5d3531e
* | | | am 5a6b4f95: Merge "Insert into user dict in lower case if auto-caps (D2)"Jean Chalard2013-01-174-11/+52
|\| | | | | | | | | | | | | | | | | | | * commit '5a6b4f953eb036c2d3e42316d0d62045686d2b30': Insert into user dict in lower case if auto-caps (D2)
| * | | Merge "Insert into user dict in lower case if auto-caps (D2)"Jean Chalard2013-01-184-11/+52
| |\| |
| | * | Insert into user dict in lower case if auto-caps (D2)Jean Chalard2013-01-174-11/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also recapitalize afterwards if the word has been changed. Bug: 7972124 Change-Id: I9306580bb4ed0ffa80cc4559ce1abcd2034d1905
* | | | am 345ef676: [Rlog78a] Annotate logUnits with correctionsKurt Partridge2013-01-173-4/+41
|\| | | | | | | | | | | | | | | | | | | * commit '345ef6762700cdb0fca25aa54b22ef83aaaac0ab': [Rlog78a] Annotate logUnits with corrections
| * | | [Rlog78a] Annotate logUnits with correctionsKurt Partridge2013-01-173-4/+41
| | |/ | |/| | | | | | | | | | | | | | | | If the user makes a correction to a word, this is now explicitly indicated in the logUnit. Change-Id: I8638aadd7b8c8e32bbc9c4b020548d786513d887
* | | am e6a9655a: Merge "Consolidate SuggestedWords.getWordInfo and .getInfo"Kurt Partridge2013-01-172-6/+2
|\| | | | | | | | | | | | | | * commit 'e6a9655a0362bebccdf0d51ebc3579573617c95a': Consolidate SuggestedWords.getWordInfo and .getInfo
| * | Merge "Consolidate SuggestedWords.getWordInfo and .getInfo"Kurt Partridge2013-01-172-6/+2
| |\ \
| | * | Consolidate SuggestedWords.getWordInfo and .getInfoKurt Partridge2013-01-172-6/+2
| | | | | | | | | | | | | | | | Change-Id: I959cf049f550b7be3ec002281ca7457e566b0214
* | | | am 937877b8: Merge "[Rlog14] Increase feedback buffer to cover whole session"Kurt Partridge2013-01-172-6/+4
|\| | | | | | | | | | | | | | | | | | | * commit '937877b8770173d209ac82c17a7e57917ea531fc': [Rlog14] Increase feedback buffer to cover whole session
| * | | Merge "[Rlog14] Increase feedback buffer to cover whole session"Kurt Partridge2013-01-172-6/+4
| |\ \ \
| | * | | [Rlog14] Increase feedback buffer to cover whole sessionKurt Partridge2013-01-152-6/+4
| | |/ / | | | | | | | | | | | | Change-Id: I55b61d9ca6eecd56181b8d2913f71559555cd89e
* | | | am 63ed9abb: Merge "[Rlog13] ResearchLogger fix feedback"Kurt Partridge2013-01-171-16/+23
|\| | | | | | | | | | | | | | | | | | | * commit '63ed9abbe881db72f84025a91025cc3e0c8f1c13': [Rlog13] ResearchLogger fix feedback
| * | | Merge "[Rlog13] ResearchLogger fix feedback"Kurt Partridge2013-01-171-16/+23
| |\ \ \
| | * | | [Rlog13] ResearchLogger fix feedbackKurt Partridge2013-01-161-16/+23
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | The feedback string was not being inserted in the feedback logs. Also changed the tag to "UserFeedback" from "UserTimestamp" to better reflect the data recorded. Change-Id: Iccf781b25e2573168c36e729419468f5bd73903e
* | | | am f881f10e: Merge "Fix commit partial text logStatement"Kurt Partridge2013-01-171-5/+5
|\| | | | | | | | | | | | | | | | | | | * commit 'f881f10e90e15c6f013c500d56fda9f8220570a7': Fix commit partial text logStatement
| * | | Merge "Fix commit partial text logStatement"Kurt Partridge2013-01-171-5/+5
| |\ \ \
| | * | | Fix commit partial text logStatementKurt Partridge2013-01-171-5/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | - No longer suggests that it is called from a non-existent method in RichInputConnection Change-Id: I25fe4a0f232a4320ca113598bbcdd029ca319944
* | | | am 34ecd12a: Merge "Add comment"Kurt Partridge2013-01-171-0/+5
|\| | | | | | | | | | | | | | | | | | | * commit '34ecd12a058cbc9756e7f323b264a27acb378206': Add comment
| * | | Merge "Add comment"Kurt Partridge2013-01-171-0/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Add commentKurt Partridge2013-01-141-0/+5
| | | | | | | | | | | | | | | | Change-Id: If21222aa678a827c1fcad5cacac0fa20655e4e5e
* | | | am c665cbee: Merge "Forward the capitalized mode to the positional info (D1)"Jean Chalard2013-01-174-6/+13
|\| | | | | | | | | | | | | | | | | | | * commit 'c665cbee7f136ea3cf334262f8dc1e7621f2004f': Forward the capitalized mode to the positional info (D1)
| * | | Merge "Forward the capitalized mode to the positional info (D1)"Jean Chalard2013-01-174-6/+13
| |\ \ \
| | * | | Forward the capitalized mode to the positional info (D1)Jean Chalard2013-01-174-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7972124 Change-Id: I3c74f3b075e698b9e9dd1d2c7b6f173073539063
* | | | | am 15ea1d40: Merge "Simplify the space-before and space-after logic."Jean Chalard2013-01-175-105/+58
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '15ea1d40967c25ab27849e1d8c0acf55d8f07e29': Simplify the space-before and space-after logic.
| * | | | Merge "Simplify the space-before and space-after logic."Jean Chalard2013-01-175-105/+58
| |\ \ \ \
| | * | | | Simplify the space-before and space-after logic.Jean Chalard2013-01-175-105/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7889078 Bug: 7268000 Change-Id: I6c77b8c9e60ef69f02526b407124d2f5d02818ee
* | | | | | am 40c59727: Merge "Add default button to vibration/volume settings dialog"Tadashi G. Takaoka2013-01-174-14/+43
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40c59727cf3c1b07a60c28f8df64876eb8ea03e3': Add default button to vibration/volume settings dialog
| * | | | | Merge "Add default button to vibration/volume settings dialog"Tadashi G. Takaoka2013-01-174-14/+43
| |\ \ \ \ \
| | * | | | | Add default button to vibration/volume settings dialogTadashi G. Takaoka2013-01-104-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7beb4517314efdefeb47d91b14a6b02c3075c19f