aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | am 1b459415: am 486c4894: Keep aspect ratio of Material action key backgroundTadashi G. Takaoka2014-09-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b459415883fa7ba8cf9b7237d4b78f030086f05':
| | * | | | | | | | | | | | am 486c4894: Keep aspect ratio of Material action key backgroundTadashi G. Takaoka2014-09-099-26/+90
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '486c4894ce0917fc7b18eaee4bfd031051f2b05b': Keep aspect ratio of Material action key background
* | | | | | | | | | | | | | | am c63e06ed: am 5e3b3ab8: am 9395014e: Don\'t resume suggestions with H/W ↵Jean Chalard2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard * commit 'c63e06ede857c1987ae3514cda825eaee6788516':
| * | | | | | | | | | | | | | am 5e3b3ab8: am 9395014e: Don\'t resume suggestions with H/W keyboardJean Chalard2014-09-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e3b3ab80994963b79fb0ca6f402ca3bc1a2260d':
| | * | | | | | | | | | | | | am 9395014e: Don\'t resume suggestions with H/W keyboardJean Chalard2014-09-081-41/+72
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9395014e76877fc9ef060a3fe54a9e06f0036d6d': Don't resume suggestions with H/W keyboard
* | | | | | | | | | | | | | | | am 1314e81b: am 1708ff6e: am 914078fd: Fix a bug where recorrection would ↵Jean Chalard2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stop on connectors * commit '1314e81b22a0bdc15f79d8a7f2ae66b9916227ae':
| * | | | | | | | | | | | | | | am 1708ff6e: am 914078fd: Fix a bug where recorrection would stop on connectorsJean Chalard2014-09-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1708ff6e5416d4333d3f52f62cd71b64ea580cd7':
| | * | | | | | | | | | | | | | am 914078fd: Fix a bug where recorrection would stop on connectorsJean Chalard2014-09-084-26/+54
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '914078fd9198aeb3d7ffa034562321d688d588f7': Fix a bug where recorrection would stop on connectors
* | | | | | | | | | | | | | | | | am 41d65a60: am b28b83cc: am 42665f0e: Merge "Mark isDefault="true" for all ↵Tadashi G. Takaoka2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supported subtypes" into lmp-dev * commit '41d65a60d59df75c42ab0fe93e575b8987bbbe2b':
| * | | | | | | | | | | | | | | | am b28b83cc: am 42665f0e: Merge "Mark isDefault="true" for all supported ↵Tadashi G. Takaoka2014-09-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subtypes" into lmp-dev * commit 'b28b83cc4c7b7dce85b0f51f7d4f3b1122db729d':
| | * | | | | | | | | | | | | | | am 42665f0e: Merge "Mark isDefault="true" for all supported subtypes" into ↵Tadashi G. Takaoka2014-09-0818-0/+432
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '42665f0ee26407fae984446b306309376aac2b36': Mark isDefault="true" for all supported subtypes
* | | | | | | | | | | | | | | | | | am 8d2551c6: am b0c7f313: am 1caa0b71: Merge "Follow up API signature ↵Yohei Yukawa2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes of CursorAnchorInfo" into lmp-dev * commit '8d2551c68f9b567e719bc9912f5bb4ffcf6db400':
| * | | | | | | | | | | | | | | | | am b0c7f313: am 1caa0b71: Merge "Follow up API signature changes of ↵Yohei Yukawa2014-09-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CursorAnchorInfo" into lmp-dev * commit 'b0c7f31333313c6d7d492c32b31b883640f3c1e0':
| | * | | | | | | | | | | | | | | | am 1caa0b71: Merge "Follow up API signature changes of CursorAnchorInfo" ↵Yohei Yukawa2014-09-082-13/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '1caa0b714dc49c8723d36d4d9825427f8978a602': Follow up API signature changes of CursorAnchorInfo
* | | | | | | | | | | | | | | | | | | am fc387d7e: am 7737c9d7: am cb077f75: Merge "Resolve an old TODO." into lmp-devJean Chalard2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc387d7ef993bbcaf236a1ed65717432cfd8b0ec':
| * | | | | | | | | | | | | | | | | | am 7737c9d7: am cb077f75: Merge "Resolve an old TODO." into lmp-devJean Chalard2014-09-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7737c9d712b37a3616267ac28848f8f3d74b29d6':
| | * | | | | | | | | | | | | | | | | am cb077f75: Merge "Resolve an old TODO." into lmp-devJean Chalard2014-09-084-30/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb077f75ac750d50c305ac5da20d81df5003907a': Resolve an old TODO.
* | | | | | | | | | | | | | | | | | | | am 9274e35e: am 97dbb22e: am 257dfa79: Merge "Revert "Use right arrow for ↵Yohei Yukawa2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the commit indicator"" into lmp-dev * commit '9274e35ed567f05058515fd9e2973bb0b5e47021':
| * | | | | | | | | | | | | | | | | | | am 97dbb22e: am 257dfa79: Merge "Revert "Use right arrow for the commit ↵Yohei Yukawa2014-09-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | indicator"" into lmp-dev * commit '97dbb22e8608cb86eb97fc9ae4c6d0321b5e0b24':
| | * | | | | | | | | | | | | | | | | | 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"
* | | | | | | | | | | | | | | | | | | | | am 27c45d42: am 40b0e3a4: am 0f33e614: Implement Floating Action Button more ↵Tadashi G. Takaoka2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keys keyboard * commit '27c45d42485964dabeb29b3c869220db68c4152f':
| * | | | | | | | | | | | | | | | | | | | am 40b0e3a4: am 0f33e614: Implement Floating Action Button more keys keyboardTadashi G. Takaoka2014-09-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40b0e3a4c87c2422c3adcc67cffe4756b510f160':
| | * | | | | | | | | | | | | | | | | | | am 0f33e614: Implement Floating Action Button more keys keyboardTadashi G. Takaoka2014-09-0810-3/+117
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f33e614c0799fa3a14a2c32db4bf0654df039da': Implement Floating Action Button more keys keyboard
* | | | | | | | | | | | | | | | | | | | | | am a09dcf8f: am 0ee849d7: am 727e818e: Move more keys divider to ↵Tadashi G. Takaoka2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MoreKeysKeyboardView * commit 'a09dcf8f856a90319d5be8be9ae325643350e4f8':
| * | | | | | | | | | | | | | | | | | | | | am 0ee849d7: am 727e818e: Move more keys divider to MoreKeysKeyboardViewTadashi G. Takaoka2014-09-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ee849d7168bc168a43a74f80d8d73a26ac54b45':
| | * | | | | | | | | | | | | | | | | | | | am 727e818e: Move more keys divider to MoreKeysKeyboardViewTadashi G. Takaoka2014-09-089-27/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '727e818e95ef68460ebafb2eb3b11c23a2d8fcd8': Move more keys divider to MoreKeysKeyboardView
* | | | | | | | | | | | | | | | | | | | | | | am e5ab9414: am 1a6651f6: am 6888ec00: Merge "Create donottranslate debug ↵Tadashi G. Takaoka2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings string resources file" into lmp-dev * commit 'e5ab941402b979091afe337523ef64b49791896b':
| * | | | | | | | | | | | | | | | | | | | | | am 1a6651f6: am 6888ec00: Merge "Create donottranslate debug settings string ↵Tadashi G. Takaoka2014-09-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources file" into lmp-dev * commit '1a6651f63603fab3b92029cd3eb3c1e818bdf5f4':
| | * | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | am b4499a1e: am 7f850186: am 6ba84dcd: Merge "Refactor action label/icon ↵Tadashi G. Takaoka2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | definitions" into lmp-dev * commit 'b4499a1e0e65413319b233076c4d2276a7c7492a':
| * | | | | | | | | | | | | | | | | | | | | | | am 7f850186: am 6ba84dcd: Merge "Refactor action label/icon definitions" ↵Tadashi G. Takaoka2014-09-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '7f8501867e488c2936366c2db2a48d2c6f200de3':
| | * | | | | | | | | | | | | | | | | | | | | | am 6ba84dcd: Merge "Refactor action label/icon definitions" into lmp-devTadashi G. Takaoka2014-09-057-268/+292
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ba84dcd96418a7a568afeaf064aa64cf94a1839': Refactor action label/icon definitions
* | | | | | | | | | | | | | | | | | | | | | | | | am 8fefd25a: am 6aad318b: am 79eae0ad: Merge "Update active key backgrounds" ↵Tadashi G. Takaoka2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '8fefd25a9bd0ee64e34a751ced7dccdd8065ee49':
| * | | | | | | | | | | | | | | | | | | | | | | | am 6aad318b: am 79eae0ad: Merge "Update active key backgrounds" into lmp-devTadashi G. Takaoka2014-09-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6aad318bd20fc55a2cd356699a1797db33ba236b':
| | * | | | | | | | | | | | | | | | | | | | | | | am 79eae0ad: Merge "Update active key backgrounds" into lmp-devTadashi G. Takaoka2014-09-0516-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '79eae0ada40d7af096ad95e03ab1f32c8369cb2c': Update active key backgrounds
* | | | | | | | | | | | | | | | | | | | | | | | | | Add word commit methods to StatsUtilsMohammadinamul Sheik2014-09-182-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibb2cf0150cd9a851ff48d097688edc916dc82998
* | | | | | | | | | | | | | | | | | | | | | | | | | Add account listing and preference integration for current accountSandeep Siddhartha2014-09-186-8/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17464068 Change-Id: Idb68a6012b285d6bc4632414bb6d11131148cf67
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Start showing the split keyboard layout"Sandeep Siddhartha2014-09-1813-23/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Start showing the split keyboard layoutSandeep Siddhartha2014-09-1713-23/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change [3/3] Added tests for Qwerty/en-US/split Parse the switch-case statement from KeyboardBuilder to use the right layout. Bug: 4968173 Change-Id: If4d6d71d5900525290268d8affa55dccf1ebd4f2
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add Accounts & privacy settings in LatinIME"Sandeep Siddhartha2014-09-189-3/+161
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Add Accounts & privacy settings in LatinIMESandeep Siddhartha2014-09-179-3/+161
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also start showing the logging preference on this screen too. This settings screen will be the container for all account management, sync and privacy related settings Bug: 17464068 Change-Id: Ie0806f6e8a542e9dea2834445ff7b38805207bda
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Pass prevWordCount to native code for getSuggestion."Keisuke Kuroyanagi2014-09-183-21/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Pass prevWordCount to native code for getSuggestion.Keisuke Kuroyanagi2014-09-183-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: Id2b49a448982c997e5c0a22445b115e675156c3e
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Switching to AndroidJUnitRunner instrumentation"Adrian Velicu2014-09-182-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Switching to AndroidJUnitRunner instrumentationAdrian Velicu2014-09-182-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16864527 Change-Id: I8a79a78f24cbc52935743311f5f0dceeb780358f
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix showing important notice even at beginning of sentence"Tadashi G. Takaoka2014-09-185-18/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix showing important notice even at beginning of sentenceTadashi G. Takaoka2014-09-185-18/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherry-pick of Ic72d6fecc3 from lmp-dev. Bug: 17536096 Change-Id: Id76b8f8dc85d03bc7ed5f24800301c081a82a8d2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Add methods to get a Key's horizontal and vertical gaps.David Faden2014-09-181-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record the horizontal and vertical gap for the key, adding corresponding accessors. This info is helpful in interpreting corresponding touch points data. Bug: 17400259 Change-Id: I825c537a48db35baab71580ff5c41cd911094a4b
* | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 233a2f21 to masterYohei Yukawa2014-09-1810-415/+264
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If391cc622367dfb4448c6a5c32b82111d352d86e
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 8c9948f4: am fa63d910: Merge "Use Add-To-Dictionary indicator only" into ↵Yohei Yukawa2014-09-1810-415/+264
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '8c9948f436bd764c6483d9af8c730e1b91e3b7ab': Use Add-To-Dictionary indicator only