aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | am 3acd0c7a: am f732f4dd: Merge "Only add spaces automatically when ↵Jean Chalard2012-11-204-10/+36
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | appropriate." into jb-mr1.1-dev * commit '3acd0c7a9f4a5f17897a4fe51b023d6f14ba7ef0': Only add spaces automatically when appropriate.
| | | * | | | | am f732f4dd: Merge "Only add spaces automatically when appropriate." into ↵Jean Chalard2012-11-204-10/+36
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev * commit 'f732f4ddccb679369b2fd2e43582b3b15aecfa1d': Only add spaces automatically when appropriate.
| | | | * | | | Merge "Only add spaces automatically when appropriate." into jb-mr1.1-devJean Chalard2012-11-204-10/+36
| | | | |\ \ \ \
| | | | | * | | | Only add spaces automatically when appropriate.Jean Chalard2012-11-194-10/+36
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly check the variations to determine if we should add automatic spaces (in manual picks and gestures) or not. Bug: 7164981 Change-Id: I19e25af839b4062c217113cd804b1473912f22a5
| * | | | | | | am 37fbcb0d: am 6d471258: am c9349db1: Merge "Add a constant for S_INT_MIN" ↵Jean Chalard2012-11-201-0/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1.1-dev * commit '37fbcb0ddf2bf61f0e432534b671596b1b6f897e': Add a constant for S_INT_MIN
| | * | | | | | am 6d471258: am c9349db1: Merge "Add a constant for S_INT_MIN" into jb-mr1.1-devJean Chalard2012-11-201-0/+6
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d471258b2eb15cb10b5eec04854a76881ebac5d': Add a constant for S_INT_MIN
| | | * | | | | am c9349db1: Merge "Add a constant for S_INT_MIN" into jb-mr1.1-devJean Chalard2012-11-201-0/+6
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c9349db1d2244a74c4d34025f7e0dd4922555706': Add a constant for S_INT_MIN
| | | | * | | | Merge "Add a constant for S_INT_MIN" into jb-mr1.1-devJean Chalard2012-11-201-0/+6
| | | | |\ \ \ \
| | | | | * | | | Add a constant for S_INT_MINJean Chalard2012-11-201-0/+6
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary for I807ae4bd Bug: 7491364 Change-Id: I46ee92a76eb65e80b64538d0300b718eac6a3ddb
| * | | | | | | am e44ce053: (-s ours) am 8a5b176f: am fd1267e3: Add Spanish United States ↵Tadashi G. Takaoka2012-11-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard (DO NOT MERGE) * commit 'e44ce053e724e74effc52cb2343082ce1c595073': Add Spanish United States keyboard (DO NOT MERGE)
| | * | | | | | am 8a5b176f: am fd1267e3: Add Spanish United States keyboard (DO NOT MERGE)Tadashi G. Takaoka2012-11-202-0/+16
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a5b176f655a46f1c575886a7d3a3c1120c91b29': Add Spanish United States keyboard (DO NOT MERGE)
| | | * | | | | am fd1267e3: Add Spanish United States keyboard (DO NOT MERGE)Tadashi G. Takaoka2012-11-202-0/+16
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fd1267e396d62694958569e35d0edfbc6b6ac7d3': Add Spanish United States keyboard (DO NOT MERGE)
| | | | * | | | Add Spanish United States keyboard (DO NOT MERGE)Tadashi G. Takaoka2012-11-192-0/+16
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7531804 Change-Id: Idd66ee30e5228260540308a97c930185b48e775f
* | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageKen Wakasa2012-11-2015-388/+541
|\| | | | | |
| * | | | | | Merge "Reorganize currency keys"Tadashi G. Takaoka2012-11-2013-357/+488
| |\ \ \ \ \ \
| | * | | | | | Reorganize currency keysTadashi G. Takaoka2012-11-2013-357/+488
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Rial(ar), Indian Rupee(hi), Tugrik(mn), Baht(th), Hryvnia(uk), Dong(vi) currency sign keys to symbol layout. Bug: 7455289 Change-Id: I0f819631ff05c4a31d3a6868dea5e18a1797f103
| * | | | | | | Merge "Fix variation dumping."Jean Chalard2012-11-191-30/+50
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix variation dumping.Jean Chalard2012-11-201-30/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Variations are not flags - they should not be OR'd in this way. Only one variation may be active at a time. Change-Id: I9d3d4c8fc04af56c914c65f9c55f1e7b9517fc68
| * | | | | | | Tentatively suppress -Winline for gcc 4.7Ken Wakasa2012-11-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 7584718 Change-Id: Ifcb7b6dbb5f0025fa3c44ef6023a95bd91452bc8
* | | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageKen Wakasa2012-11-199-214/+272
|\| | | | | | |
| * | | | | | | Merge "Add Spanish United States keyboard"Tadashi G. Takaoka2012-11-188-49/+100
| |\ \ \ \ \ \ \
| | * | | | | | | Add Spanish United States keyboardTadashi G. Takaoka2012-11-198-49/+100
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subtype locale name on the spacebar will be suppressed when only one subtype is enabled and - Subtype locale is equal to the system locale. or - Subtype language is equal to the system language but the subtype is implicitly enabled. Thus the "es_ES" system locale chooses "es" subtype keyboard implicitly but the keyboard doesn't have the subtype name on its spacebar. This change also removes Spanish Latin America keyboard. Bug: 7531804 Change-Id: Ib929e8235d643c0ba039eb010e18ab721a734e15
| * / / / / / / Tidy up the base char mapKen Wakasa2012-11-191-165/+172
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c3119c5db35faaf73180f17a0888224e301c121
* | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageKen Wakasa2012-11-171-1/+2
|\| | | | | |
| * | | | | | am 333881c4: am 1f256e94: am 66cee1f9: Merge "Revert "Correctly add double ↵Ken Wakasa2012-11-162-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | quote to the space strippers"" into jb-mr1.1-dev * commit '333881c434f3905763dd92a585b17f9c515dd8a8': Revert "Correctly add double quote to the space strippers"
| | * | | | | am 1f256e94: am 66cee1f9: Merge "Revert "Correctly add double quote to the ↵Ken Wakasa2012-11-162-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | space strippers"" into jb-mr1.1-dev * commit '1f256e941b746a3ccfbd0b60d5e6ccd09d3a3af1': Revert "Correctly add double quote to the space strippers"
| | | * | | | am 66cee1f9: Merge "Revert "Correctly add double quote to the space ↵Ken Wakasa2012-11-162-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strippers"" into jb-mr1.1-dev * commit '66cee1f92de0413756b8f306275d3508cd2b040f': Revert "Correctly add double quote to the space strippers"
| | | | * | | Merge "Revert "Correctly add double quote to the space strippers"" into ↵Ken Wakasa2012-11-162-2/+2
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev
| | | | | * | | Revert "Correctly add double quote to the space strippers"Ken Wakasa2012-11-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit af7264abb7abfc0dab08d332b10b9ec8a6b48dc6 Change-Id: I5673103c4a0e9c48df563187d2188ca6e2f15877 bug: 7561815
| * | | | | | | resolved conflicts for merge of 4ad92578 to masterKen Wakasa2012-11-174-31/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29ad9f0ba357e39889e30c9ebfcf61f9d08ee4ef
| | * | | | | | am 7acd310d: am f9ff4fb5: Merge "Revert "Only add spaces automatically when ↵Ken Wakasa2012-11-164-31/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | appropriate."" into jb-mr1.1-dev * commit '7acd310d02f060f3e3e29000db902dffb6b0df9c': Revert "Only add spaces automatically when appropriate."
| | | * | | | | am f9ff4fb5: Merge "Revert "Only add spaces automatically when ↵Ken Wakasa2012-11-164-31/+10
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | appropriate."" into jb-mr1.1-dev * commit 'f9ff4fb5da5971bd02eec491a497006540e1438a': Revert "Only add spaces automatically when appropriate."
| | | | * | | | Merge "Revert "Only add spaces automatically when appropriate."" into ↵Ken Wakasa2012-11-164-31/+10
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | jb-mr1.1-dev
| | | | | * | | Revert "Only add spaces automatically when appropriate."Ken Wakasa2012-11-164-31/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6ce66d1c7d4a5be9c6ed33e4f881994283d5eee9 Change-Id: I90004a5fea0bc7999ecf8742f883ff4dac264d8a bug: 7565414
| * | | | | | | resolved conflicts for merge of 6f42cf1d to masterMarco Nelissen2012-11-164-10/+31
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I054bb0cfba9de06473100010a76e2f3d9c2c1180
| | * | | | | | am 3dd4548e: am 191d49ae: Merge "Only add spaces automatically when ↵Jean Chalard2012-11-154-10/+31
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | appropriate." into jb-mr1.1-dev * commit '3dd4548ec6105ca774e84ab3223bdbcea1e4902e': Only add spaces automatically when appropriate.
| | | * | | | | am 191d49ae: Merge "Only add spaces automatically when appropriate." into ↵Jean Chalard2012-11-154-10/+31
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev * commit '191d49ae8a0f4bb10724b83d9424d80f08ac7181': Only add spaces automatically when appropriate.
| | | | * | | | Merge "Only add spaces automatically when appropriate." into jb-mr1.1-devJean Chalard2012-11-154-10/+31
| | | | |\| | |
| | | | | * | | Only add spaces automatically when appropriate.Jean Chalard2012-11-154-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7164981 Change-Id: Id672104a0fda99c52923913fb0e40c3a1ead4787
| * | | | | | | am 8c470f16: am 5dee6e69: am 187e683a: Merge "Fix a bug with some text ↵Jean Chalard2012-11-161-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fields" into jb-mr1.1-dev * commit '8c470f16db291e257ac538bd0ac2a9354d34010c': Fix a bug with some text fields
| | * | | | | | am 5dee6e69: am 187e683a: Merge "Fix a bug with some text fields" into ↵Jean Chalard2012-11-141-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev * commit '5dee6e69f1de114df1f258fdc62559237989dc75': Fix a bug with some text fields
| | | * | | | | am 187e683a: Merge "Fix a bug with some text fields" into jb-mr1.1-devJean Chalard2012-11-141-1/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '187e683aea117fde1ad2de2d0cdd18c3fd4ce7f4': Fix a bug with some text fields
| | | | * | | | Merge "Fix a bug with some text fields" into jb-mr1.1-devJean Chalard2012-11-141-1/+2
| | | | |\ \ \ \
| | | | | * | | | Fix a bug with some text fieldsJean Chalard2012-11-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure when this happens exactly, but it is possible that InputConnection#getTextBeforeCursor returns null. This happens for example upon rotating the screen with the composing field empty in Gmail. In this case, StringBuilder#append will convert the null pointer into the string "null", which is sure better than a crash, but can have a number of bad side-effects, like auto-caps not working. Bug: 7533034 Change-Id: Ia1cfab432c13a12ff1c2f013c59bac05a587f553
| * | | | | | | | am 12c2e437: am d7dbaa9c: am e4958d5c: Merge "Correctly add double quote to ↵Jean Chalard2012-11-162-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the space strippers" into jb-mr1.1-dev * commit '12c2e437949414ce52b7e40ad191f15c844726e9': Correctly add double quote to the space strippers
| | * | | | | | | am d7dbaa9c: am e4958d5c: Merge "Correctly add double quote to the space ↵Jean Chalard2012-11-142-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strippers" into jb-mr1.1-dev * commit 'd7dbaa9cb6d6b511ad80ac770bc1de328ad95d76': Correctly add double quote to the space strippers
| | | * | | | | | am e4958d5c: Merge "Correctly add double quote to the space strippers" into ↵Jean Chalard2012-11-142-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev * commit 'e4958d5c185ecf3a4e953c4a20f0208ac396da56': Correctly add double quote to the space strippers
| | | | * | | | | Merge "Correctly add double quote to the space strippers" into jb-mr1.1-devJean Chalard2012-11-142-2/+2
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | |
| | | | | * | | | Correctly add double quote to the space strippersJean Chalard2012-11-142-2/+2
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a format error >.> Bug: 7531719 Change-Id: I34b4c496192a32862c1ecb85bb6f6f38a06d6c61
| * | | | | | | am 24bf5fe6: (-s ours) am b1844a57: am b240c38e: Merge "[DO NOT MERGE] ↵Jean Chalard2012-11-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct a wrong base character in Russian" into jb-mr1.1-dev * commit '24bf5fe6181ae61298a5c2ee4c6c559b95391a0a': [DO NOT MERGE] Correct a wrong base character in Russian