Ken Wakasa
64176158e7
resolved conflicts for merge of 75513e51
to master
...
Change-Id: I058c3e63e5e349b58b2bdd2723cb43fbc24a0425
2014-09-13 10:41:19 +09:00
Ken Wakasa
8ed81f9fd7
resolved conflicts for merge of 8e9385cc
to master
...
Change-Id: Ia6d192ee4a8496afa3f788894844ebef78fb7a8c
2014-09-13 09:25:23 +09:00
Tadashi G. Takaoka
f5901b6e2d
am 1b459415
: am 486c4894
: Keep aspect ratio of Material action key background
...
* commit '1b459415883fa7ba8cf9b7237d4b78f030086f05':
2014-09-12 23:22:18 +00:00
Jean Chalard
c63e06ede8
am 5e3b3ab8
: am 9395014e
: Don\'t resume suggestions with H/W keyboard
...
* commit '5e3b3ab80994963b79fb0ca6f402ca3bc1a2260d':
2014-09-12 23:22:17 +00:00
Jean Chalard
1314e81b22
am 1708ff6e
: am 914078fd
: Fix a bug where recorrection would stop on connectors
...
* commit '1708ff6e5416d4333d3f52f62cd71b64ea580cd7':
2014-09-12 23:22:16 +00:00
Tadashi G. Takaoka
41d65a60d5
am b28b83cc
: am 42665f0e
: Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev
...
* commit 'b28b83cc4c7b7dce85b0f51f7d4f3b1122db729d':
2014-09-12 23:22:15 +00:00
Yohei Yukawa
8d2551c68f
am b0c7f313
: am 1caa0b71
: Merge "Follow up API signature changes of CursorAnchorInfo" into lmp-dev
...
* commit 'b0c7f31333313c6d7d492c32b31b883640f3c1e0':
2014-09-12 23:22:14 +00:00
Jean Chalard
fc387d7ef9
am 7737c9d7
: am cb077f75
: Merge "Resolve an old TODO." into lmp-dev
...
* commit '7737c9d712b37a3616267ac28848f8f3d74b29d6':
2014-09-12 23:22:13 +00:00
Yohei Yukawa
9274e35ed5
am 97dbb22e
: am 257dfa79
: Merge "Revert "Use right arrow for the commit indicator"" into lmp-dev
...
* commit '97dbb22e8608cb86eb97fc9ae4c6d0321b5e0b24':
2014-09-12 23:22:02 +00:00
Tadashi G. Takaoka
27c45d4248
am 40b0e3a4
: am 0f33e614
: Implement Floating Action Button more keys keyboard
...
* commit '40b0e3a4c87c2422c3adcc67cffe4756b510f160':
2014-09-12 23:22:01 +00:00
Tadashi G. Takaoka
a09dcf8f85
am 0ee849d7
: am 727e818e
: Move more keys divider to MoreKeysKeyboardView
...
* commit '0ee849d7168bc168a43a74f80d8d73a26ac54b45':
2014-09-12 23:22:00 +00:00
Tadashi G. Takaoka
e5ab941402
am 1a6651f6
: am 6888ec00
: Merge "Create donottranslate debug settings string resources file" into lmp-dev
...
* commit '1a6651f63603fab3b92029cd3eb3c1e818bdf5f4':
2014-09-12 23:21:59 +00:00
Tadashi G. Takaoka
b4499a1e0e
am 7f850186
: am 6ba84dcd
: Merge "Refactor action label/icon definitions" into lmp-dev
...
* commit '7f8501867e488c2936366c2db2a48d2c6f200de3':
2014-09-12 23:21:53 +00:00
Tadashi G. Takaoka
8fefd25a9b
am 6aad318b
: am 79eae0ad
: Merge "Update active key backgrounds" into lmp-dev
...
* commit '6aad318bd20fc55a2cd356699a1797db33ba236b':
2014-09-12 23:21:51 +00:00
Baligh Uddin
6297897fcc
am 468daeb7
: (-s ours) am 8aa54301
: (-s ours) am 64dd48e3
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '468daeb79106a71226382c3a6d41232addba1f9f':
Import translations. DO NOT MERGE
2014-09-12 19:19:42 +00:00
Jatin Matani
4d8efc9787
am b41d1fcd
: am d0d8f90a
: Merge "Reorganize settings in Google Keyboard" into lmp-dev
...
* commit 'b41d1fcd98dc30545919fb5401f68fa909682aae':
Reorganize settings in Google Keyboard
2014-09-12 19:17:05 +00:00
Tadashi G. Takaoka
75513e5113
am ca9c061c
: am fd5f2b91
: Merge "Fix not always showing input view with physical keyboard connected" into lmp-dev
...
* commit 'ca9c061c4147d5810123e200897443536e6f4aaa':
Fix not always showing input view with physical keyboard connected
2014-09-12 19:17:03 +00:00
Jean Chalard
8e9385cc09
am 567c0dd4
: am 7aa47cb3
: Only do double-space-period on real text fields.
...
* commit '567c0dd471b16445a44af6c743290817a3c1d38b':
Only do double-space-period on real text fields.
2014-09-12 19:17:00 +00:00
Tadashi G. Takaoka
d190b8c521
am c24340f9
: am 74d59cca
: am dc1097ee
: Merge "Update AOSP launcher icon" into lmp-dev
...
* commit 'c24340f956c16d8594c44d45685f8a814538245b':
Update AOSP launcher icon
2014-09-12 19:16:40 +00:00
Tadashi G. Takaoka
3ecae3d37f
am 1073ef97
: am 1bb20aa0
: am 31544dcb
: Add xxxhdpi assets
...
* commit '1073ef9756617ecd2b4eeddca045039d9e6f3d14':
Add xxxhdpi assets
2014-09-12 19:16:33 +00:00
Jatin Matani
b41d1fcd98
am d0d8f90a
: Merge "Reorganize settings in Google Keyboard" into lmp-dev
...
* commit 'd0d8f90a32b907b867f8fa934dc7582ff53a9a43':
Reorganize settings in Google Keyboard
2014-09-12 18:51:03 +00:00
Tadashi G. Takaoka
ca9c061c41
am fd5f2b91
: Merge "Fix not always showing input view with physical keyboard connected" into lmp-dev
...
* commit 'fd5f2b91fdb67921edf3d9071557d013fa498386':
Fix not always showing input view with physical keyboard connected
2014-09-12 18:51:02 +00:00
Jean Chalard
567c0dd471
am 7aa47cb3
: Only do double-space-period on real text fields.
...
* commit '7aa47cb3748d82b6f8bf3713c3c9e05b3fca8979':
Only do double-space-period on real text fields.
2014-09-12 18:51:00 +00:00
Sandeep Siddhartha
9c31e8f863
Initial split QWERTY layout
...
Change [2/3]
Add an attribute that's used in layout xmls for specifying
the split-keyboard layout.
This attribute will be checked/set by the KeyboardBuilder which knows about
the "splittability" of the keyboard.
Bug: 4968173
Change-Id: I5d792e570b9648e09022e9b7e92a972a161009ee
2014-09-12 18:46:27 +09:00
Sandeep Siddhartha
3939455c1d
Add a canSplitKeyboard attribute for specifying split keyboard layouts
...
Change [1/3]
This'll be used in conjunction with a user preference to split the keyboard when possible.
Bug: 4968173
Change-Id: I7a05948d67b94a55024790115ae261d7fef7941a
2014-09-12 18:46:14 +09:00
Jatin Matani
d0d8f90a32
Merge "Reorganize settings in Google Keyboard" into lmp-dev
2014-09-12 09:12:01 +00:00
Tadashi G. Takaoka
fd5f2b91fd
Merge "Fix not always showing input view with physical keyboard connected" into lmp-dev
2014-09-12 09:02:31 +00:00
Tadashi G. Takaoka
3a90cb9ad0
Reorganize settings in Google Keyboard
...
Changes :
Input languages -> Languages
Input preferences -> Preferences
Multi lingual Options -> Multilingual Options
Keyboard Theme -> Theme
Gesture typing preferences -> Gesture typing
**New
Appearance
-> Theme
-> Custom input style
**Removed
Multilingual options from L dynamically
Bug: 11866784
Change-Id: I07404c27868e1b087b0cafb63d2031a5b493a885
2014-09-12 02:00:26 -07:00
Jean Chalard
7aa47cb374
Only do double-space-period on real text fields.
...
Bug: 15559216
Change-Id: Id6ecadc58c03889496967d67371457e4050d695b
2014-09-12 17:49:47 +09:00
Tadashi G. Takaoka
88f282de0d
Fix not always showing input view with physical keyboard connected
...
Bug: 17163374
Change-Id: I57f7eeac0c9ac0a15d3d55927e18a2d97849c508
2014-09-12 17:45:35 +09:00
Keisuke Kuroyanagi
1605630cf9
Merge "Use WordIdArrayView for prevWordIds."
2014-09-12 06:31:13 +00:00
Baligh Uddin
468daeb791
am 8aa54301
: (-s ours) am 64dd48e3
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '8aa543017109daa52bd1b6ef4e3d185f7cbfa119':
Import translations. DO NOT MERGE
2014-09-11 18:31:56 +00:00
Baligh Uddin
8aa5430171
am 64dd48e3
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '64dd48e381266ac63a2b9d6145040191bacdae10':
Import translations. DO NOT MERGE
2014-09-11 17:35:41 +00:00
Yohei Yukawa
97b465044f
am ead70974
: am 27ccbeb4
: am cd119050
: Support CursorAnchorInfo in the full-screen mode
...
* commit 'ead70974aecd78d5bad0fa87a759f6bf82dcb503':
Support CursorAnchorInfo in the full-screen mode
2014-09-11 17:31:47 +00:00
Baligh Uddin
64dd48e381
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-11 17:21:01 +00:00
Baligh Uddin
ee54c35bad
Merge "Import translations. DO NOT MERGE"
2014-09-11 17:20:58 +00:00
Tadashi G. Takaoka
c24340f956
am 74d59cca
: am dc1097ee
: Merge "Update AOSP launcher icon" into lmp-dev
...
* commit '74d59ccae1974005f8b12940e4a109c70eecd765':
Update AOSP launcher icon
2014-09-11 15:52:22 +00:00
Tadashi G. Takaoka
1073ef9756
am 1bb20aa0
: am 31544dcb
: Add xxxhdpi assets
...
* commit '1bb20aa0cf99c72aef702ebb0464c0c1e4476ccb':
Add xxxhdpi assets
2014-09-11 15:52:19 +00:00
Tadashi G. Takaoka
74d59ccae1
am dc1097ee
: Merge "Update AOSP launcher icon" into lmp-dev
...
* commit 'dc1097ee2e85daaed525ceff2154d4d7252c75ed':
Update AOSP launcher icon
2014-09-11 15:38:55 +00:00
Tadashi G. Takaoka
1bb20aa0cf
am 31544dcb
: Add xxxhdpi assets
...
* commit '31544dcb43bfb4f14339d1c2b3ffa92063487c0c':
Add xxxhdpi assets
2014-09-11 15:38:54 +00:00
Tadashi G. Takaoka
dc1097ee2e
Merge "Update AOSP launcher icon" into lmp-dev
2014-09-11 15:28:53 +00:00
Tadashi G. Takaoka
ed9e100449
Update AOSP launcher icon
...
Bug: 16635354
Bug: 16635354
Change-Id: I68f9c4ec21a01b9db0fc73c1785c972f5d7ac05b
2014-09-12 00:25:43 +09:00
Tadashi G. Takaoka
31544dcb43
Add xxxhdpi assets
...
Bug: 17432407
Change-Id: I68e5f660425db567688d4e119c94fc34430f8ff3
2014-09-11 15:09:30 +00:00
Keisuke Kuroyanagi
537f6eea8a
Use WordIdArrayView for prevWordIds.
...
Bug: 14425059
Change-Id: Ia84fb997d89564e60111b46ca83bbfa3b187f316
2014-09-11 19:36:22 +09:00
Jean Chalard
96f0ae5e68
[ML6] Have asyncReloadMainDictionary support multiple locales
...
Change-Id: I4c3dfaad38ec1cc91d1a9f81d5ff45ef12f70029
2014-09-11 19:05:22 +09:00
Jean Chalard
e6df5f015c
[ML5] Rewrite resetDictionariesWithDictNamePrefix
...
This change rewrites resetDictionariesWithDictNamePrefix so
that it would work if there were several locales, which is going to
happen shortly. This change on its own is quite large and difficult
already, so I didn't want to merge it into the change that actually
makes several locales happen; another such change is following.
Change-Id: Ibb80b05b73c0f0f0bea64b7e308cc4d38ca448f9
2014-09-11 19:05:19 +09:00
Yohei Yukawa
ead70974ae
am 27ccbeb4
: am cd119050
: Support CursorAnchorInfo in the full-screen mode
...
* commit '27ccbeb4e69e32641c20afa32d8e57c46fcc412e':
Support CursorAnchorInfo in the full-screen mode
2014-09-11 10:05:10 +00:00
Yohei Yukawa
27ccbeb4e6
am cd119050
: Support CursorAnchorInfo in the full-screen mode
...
* commit 'cd11905022306c9b95f8781f0f8b23a3570f30e9':
Support CursorAnchorInfo in the full-screen mode
2014-09-11 09:54:42 +00:00
Yohei Yukawa
cd11905022
Support CursorAnchorInfo in the full-screen mode
...
This CL allows to emulate the behavior of CursorAnchorInfo
in the full-screen mode to work around the limitation of
the framework.
Basically this CL copies relevant code from the framework
to LatinIME. This is actually a code duplicate which isn't
great, but probably the only way that is available right now.
Change-Id: I30bc8c3387c91c8e47252ba699cbd967d8927dad
2014-09-11 18:36:53 +09:00
Keisuke Kuroyanagi
eff9be9cd6
Merge "Implement IntArrayView.copyToBuffer()."
2014-09-11 07:08:30 +00:00