aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | am cb077f75: Merge "Resolve an old TODO." into lmp-devJean Chalard2014-09-084-30/+37
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb077f75ac750d50c305ac5da20d81df5003907a': Resolve an old TODO.
| | * | | | | | | | Merge "Resolve an old TODO." into lmp-devJean Chalard2014-09-084-30/+37
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | Resolve an old TODO.Jean Chalard2014-09-054-30/+37
| | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is cleaner. Bug: 17347779 Change-Id: I5b612783b1ec98a1a11401f00d68db49654f3023
* | | | | | | | | am a6c53d31: am 257dfa79: Merge "Revert "Use right arrow for the commit ↵Yohei Yukawa2014-09-081-16/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | indicator"" into lmp-dev * commit 'a6c53d31fd5edfa67c02745d77865bb6745a86a0': Revert "Use right arrow for the commit indicator"
| * | | | | | | | am 257dfa79: Merge "Revert "Use right arrow for the commit indicator"" into ↵Yohei Yukawa2014-09-081-16/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '257dfa79f7f19eac5f3481f1b8fe28038d1e0c5e': Revert "Use right arrow for the commit indicator"
| | * | | | | | | Merge "Revert "Use right arrow for the commit indicator"" into lmp-devYohei Yukawa2014-09-081-16/+10
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Revert "Use right arrow for the commit indicator"Yohei Yukawa2014-09-081-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2412d9ae3c89db4fea8943cca884f0fb105795ef. Change-Id: Ie8090735850e2f2d075d0bdaf3ef628d866b5514
* | | | | | | | | am 9ca6658e: am 0f33e614: Implement Floating Action Button more keys keyboardTadashi G. Takaoka2014-09-0810-3/+117
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9ca6658e9a3cb422bbff00daa976071c8cce69cd': Implement Floating Action Button more keys keyboard
| * | | | | | | | am 0f33e614: Implement Floating Action Button more keys keyboardTadashi G. Takaoka2014-09-0810-3/+117
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f33e614c0799fa3a14a2c32db4bf0654df039da': Implement Floating Action Button more keys keyboard
| | * | | | | | | Implement Floating Action Button more keys keyboardTadashi G. Takaoka2014-09-0810-3/+117
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15681452 Change-Id: I8484e4fe4d989b391f2b5230836dc9dfac218429
* | | | | | | | am f21c77d7: am 727e818e: Move more keys divider to MoreKeysKeyboardViewTadashi G. Takaoka2014-09-089-27/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f21c77d7b77ae3e82aaa654107ac549e96d1bac2': Move more keys divider to MoreKeysKeyboardView
| * | | | | | | am 727e818e: Move more keys divider to MoreKeysKeyboardViewTadashi G. Takaoka2014-09-089-27/+49
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '727e818e95ef68460ebafb2eb3b11c23a2d8fcd8': Move more keys divider to MoreKeysKeyboardView
| | * | | | | | Move more keys divider to MoreKeysKeyboardViewTadashi G. Takaoka2014-09-089-27/+49
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15681452 Change-Id: I1b32719cc927a24db4c41fdeb812b39f7e98a85c
* | | | | | | am 1b430219: am 6888ec00: Merge "Create donottranslate debug settings string ↵Tadashi G. Takaoka2014-09-054-41/+60
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources file" into lmp-dev * commit '1b43021949be0cdd3b0c0ab64672364a680a6c68': Create donottranslate debug settings string resources file
| * | | | | | am 6888ec00: Merge "Create donottranslate debug settings string resources ↵Tadashi G. Takaoka2014-09-054-41/+60
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file" into lmp-dev * commit '6888ec009951ffd900c04a0ad179a94d47eca03c': Create donottranslate debug settings string resources file
| | * | | | | Merge "Create donottranslate debug settings string resources file" into lmp-devTadashi G. Takaoka2014-09-054-41/+60
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Create donottranslate debug settings string resources fileTadashi G. Takaoka2014-09-054-41/+60
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up of the I26e4d292de. Bug: 15678343 Bug: 17385083 Change-Id: I2c2b08b8dd991ac981aa8f8c8436de9e4399da5f
* | | | | | am c7b8858e: am 6ba84dcd: Merge "Refactor action label/icon definitions" ↵Tadashi G. Takaoka2014-09-057-268/+292
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'c7b8858ec1b3b0c4f09a3f55281a3aaa9f97c58d': Refactor action label/icon definitions
| * | | | | am 6ba84dcd: Merge "Refactor action label/icon definitions" into lmp-devTadashi G. Takaoka2014-09-057-268/+292
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ba84dcd96418a7a568afeaf064aa64cf94a1839': Refactor action label/icon definitions
| | * | | | Merge "Refactor action label/icon definitions" into lmp-devTadashi G. Takaoka2014-09-057-268/+292
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Refactor action label/icon definitionsTadashi G. Takaoka2014-09-057-268/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15782668 Change-Id: Ibf1205d46e9293d516a56030ba10841128f57450
* | | | | | am 9d3db691: am 79eae0ad: Merge "Update active key backgrounds" into lmp-devTadashi G. Takaoka2014-09-0516-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d3db6914bc49e2c06c9b474ff9fb7d5e178768a': Update active key backgrounds
| * | | | | am 79eae0ad: Merge "Update active key backgrounds" into lmp-devTadashi G. Takaoka2014-09-0516-0/+0
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | * commit '79eae0ada40d7af096ad95e03ab1f32c8369cb2c': Update active key backgrounds
| | * | | Merge "Update active key backgrounds" into lmp-devTadashi G. Takaoka2014-09-0516-0/+0
| | |\ \ \
| | | * | | Update active key backgroundsTadashi G. Takaoka2014-09-0416-0/+0
| | | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 15681452 Change-Id: I05f06b35748d090a58f3524df719586093431d07
* | | | | am 3d84b383: (-s ours) am 3305a02d: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '3d84b3835dd401ea5b6c4085c8b36aad9cf9d6ab': Import translations. DO NOT MERGE
| * | | | am 3305a02d: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-040-0/+0
| |\| | | | | |/ / | |/| | | | | | | | | | * commit '3305a02dc380c9df15e38de738cab277edcfabad': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-09-0473-2972/+1336
| |/ / | | | | | | | | | | | | Change-Id: I198c14a1374a0b61bf5aa3cdf013fca8260bc97f Auto-generated-cl: translation import
* | | am 464ff7c1: Add unit tests for enter key\'s more keysTadashi G. Takaoka2014-09-033-0/+380
|\| | | | | | | | | | | | | | * commit '464ff7c131b097e1320a6d7b9207ccbf3eb70d22': Add unit tests for enter key's more keys
| * | Add unit tests for enter key's more keysTadashi G. Takaoka2014-09-043-0/+380
| | | | | | | | | | | | | | | Bug: 15681452 Change-Id: I3070c46bb2c0cb8ccaae66eaea132b41c567e135
* | | am e8e08213: Merge "Add shared abstract test class for action label test" ↵Tadashi G. Takaoka2014-09-033-154/+179
|\| | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'e8e08213060bd14c7086d83b270f5fda258000bd': Add shared abstract test class for action label test
| * | Merge "Add shared abstract test class for action label test" into lmp-devTadashi G. Takaoka2014-09-033-154/+179
| |\ \
| | * | Add shared abstract test class for action label testTadashi G. Takaoka2014-09-033-154/+179
| | | | | | | | | | | | | | | | | | | | Bug: 15681452 Change-Id: I0ad21e6979aed1b5c8c210399c4edfd5993adbdc
* | | | am cc5050d7: Update spacebar background for MaterialTadashi G. Takaoka2014-09-0320-6/+6
|\| | | | | | | | | | | | | | | | | | | * commit 'cc5050d7cab56f08767a833bb76a60a23a8c12d1': Update spacebar background for Material
| * | | Update spacebar background for MaterialTadashi G. Takaoka2014-09-0320-6/+6
| |/ / | | | | | | | | | | | | Bug: 17318036 Change-Id: Iaa091b525433d56db9aca9e0301f3727ce392605
* | | am 1c2cf719: Add new value "spacebar" to Key.backgroundType attributeTadashi G. Takaoka2014-09-038-8/+32
|\| | | | | | | | | | | | | | * commit '1c2cf71921f0f09e39c1df86c1e57d4c607aad34': Add new value "spacebar" to Key.backgroundType attribute
| * | Add new value "spacebar" to Key.backgroundType attributeTadashi G. Takaoka2014-09-038-8/+32
| | | | | | | | | | | | | | | Bug: 17318036 Change-Id: Ie84438a6aa3adc14a9db603d0cd4d5e37a55d612
* | | am 5a9c9649: Removes "customAction" value from Key.backgroundType attributeTadashi G. Takaoka2014-09-034-15/+0
|\| | | | | | | | | | | | | | * commit '5a9c9649db0e31eb8aa6a447dbde49e513933da3': Removes "customAction" value from Key.backgroundType attribute
| * | Removes "customAction" value from Key.backgroundType attributeTadashi G. Takaoka2014-09-034-15/+0
| | | | | | | | | | | | | | | Bug: 17318036 Change-Id: I6a36d50ba2e69eafbb0faa049014281bd4d4ddfc
* | | am 0af2472a: Add new "keyboardTheme" <case> predicatorTadashi G. Takaoka2014-09-039-22/+75
|\| | | | | | | | | | | | | | * commit '0af2472a69bf8aad21ce1603e912adab3891667e': Add new "keyboardTheme" <case> predicator
| * | Add new "keyboardTheme" <case> predicatorTadashi G. Takaoka2014-09-039-22/+75
| | | | | | | | | | | | | | | Bug: 17318036 Change-Id: Ief386c84969d8646fb5cfe2050a2f59a7db16c88
* | | am 310da35c: Merge "Follow up API signature change" into lmp-devYohei Yukawa2014-09-033-21/+19
|\| | | | | | | | | | | | | | * commit '310da35c77779f399e12c1e4365e6372d1477ef3': Follow up API signature change
| * | Merge "Follow up API signature change" into lmp-devYohei Yukawa2014-09-033-21/+19
| |\ \
| | * | Follow up API signature changeYohei Yukawa2014-09-033-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up CL for API signature change in I772c48ff18918e48a81e807b48ff907614485c09 BUG: 17320996 Change-Id: Ic8b6162bda12bf74fae79af212c5d81c400eb9e8
* | | | am ca70bd5f: Fix depedency of debug settingsTadashi G. Takaoka2014-09-031-6/+6
|\| | | | | | | | | | | | | | | | | | | * commit 'ca70bd5f3a3f3836727fa07aaf2264187a2ffdf7': Fix depedency of debug settings
| * | | Fix depedency of debug settingsTadashi G. Takaoka2014-09-031-6/+6
| |/ / | | | | | | | | | | | | | | | This is a follow of the I26e4d292de. Bug: 15678343 Change-Id: I364d6df386cf32102e4ebb0151d18e49dcc5bd2c
* | | am 8c42bf54: Follow API signature change in CursorAnchorInfoYohei Yukawa2014-09-032-33/+16
|\| | | | | | | | | | | | | | * commit '8c42bf54af9afe44eade9f0c36cfd2136d20e2f6': Follow API signature change in CursorAnchorInfo
| * | Follow API signature change in CursorAnchorInfoYohei Yukawa2014-09-022-33/+16
| | | | | | | | | | | | | | | | | | | | | | | | This is just a follow up CL for Ia8cbb9f6b41cd9509fc0147fd68763df. No behavial change is intended. BUG: 17200900 Change-Id: Iba23b731ebde64ec2e816c5b4bef1d93632fce1e
* | | am 6ef88a65: Merge "Use right arrow for the commit indicator" into lmp-devYohei Yukawa2014-09-021-10/+16
|\| | | | | | | | | | | | | | * commit '6ef88a65a285cf69939c76976228ae403f463bca': Use right arrow for the commit indicator
| * | Merge "Use right arrow for the commit indicator" into lmp-devYohei Yukawa2014-09-021-10/+16
| |\|