Tadashi G. Takaoka
723391c945
Merge "Tidy up Utils class a bit"
2013-05-31 06:29:24 +00:00
Keisuke Kuroyanagi
68d17aea65
am f88f9dbb: Move "#define LOG_TAG" before include defines.h.
...
* commit 'f88f9dbbdec309c01feda06edc142470ba13cb2f':
Move "#define LOG_TAG" before include defines.h.
2013-05-30 22:29:40 -07:00
Keisuke Kuroyanagi
f88f9dbbde
Move "#define LOG_TAG" before include defines.h.
...
Change-Id: Iacd2c2ea3878ad2cde5df36b15e1359d10244f60
2013-05-30 22:26:21 -07:00
Kurt Partridge
502ff08512
am e6125db9: Merge "Catch a permission exception"
...
* commit 'e6125db98d9e61841a4bde791ff0d9aed151f126':
Catch a permission exception
2013-05-30 17:31:37 -07:00
Kurt Partridge
e6125db98d
Merge "Catch a permission exception"
2013-05-31 00:30:14 +00:00
Ken Wakasa
e203961dd6
am a65c267b: Move some dictionary related implementations to the dictionary directory
...
* commit 'a65c267b1f1207e54c6f821148c600e3899b7f9c':
Move some dictionary related implementations to the dictionary directory
2013-05-30 16:16:35 -07:00
Kurt Partridge
d63f756013
Catch a permission exception
...
This change catches a SecurityException if the DictionaryProvider is
unavailable.
Change-Id: I4f2d87327c40765383d8847fd4e934b3cf799488
2013-05-30 13:40:40 -07:00
Tadashi G. Takaoka
cbb99c60be
Tidy up Utils class a bit
...
Change-Id: Idc2feb84a902a6cbb7265d1efe06c34e7d63c2c7
2013-05-31 00:32:57 +09:00
Ken Wakasa
a65c267b1f
Move some dictionary related implementations to the dictionary directory
...
Change-Id: I6fe71a540ad91ca46755be234abc8894242e2413
2013-05-31 00:02:57 +09:00
Tadashi G. Takaoka
15c671a3b6
am 7097aa2d: Merge "Cleanup unreadable variable names"
...
* commit '7097aa2d3d2fc4d314edebb43edc8a0552517630':
Cleanup unreadable variable names
2013-05-30 06:11:01 -07:00
Tadashi G. Takaoka
08870866cb
am d67db32b: Merge "Separate SuggestionStripLayoutHelper for readablity"
...
* commit 'd67db32b30a2d77e5e5733d62d6265c34c380947':
Separate SuggestionStripLayoutHelper for readablity
2013-05-30 06:10:59 -07:00
Tadashi G. Takaoka
7097aa2d3d
Merge "Cleanup unreadable variable names"
2013-05-30 13:09:27 +00:00
Tadashi G. Takaoka
d67db32b30
Merge "Separate SuggestionStripLayoutHelper for readablity"
2013-05-30 13:09:17 +00:00
The Android Automerger
d76cbb0e37
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-30 05:56:10 -07:00
Ken Wakasa
4647c4c78e
am 424a173d: Merge "Move additional_proximity_chars to the layout directory"
...
* commit '424a173db8cd4dfd7b5a986310ec2d815a4eb171':
Move additional_proximity_chars to the layout directory
2013-05-30 05:21:55 -07:00
Ken Wakasa
424a173db8
Merge "Move additional_proximity_chars to the layout directory"
2013-05-30 12:18:10 +00:00
Jean Chalard
9a28541e05
am 1a50999e: Merge "Tell the text view we reset state on finish input"
...
* commit '1a50999ed9cfbffa03b8e034ec67f06a8e5c68ba':
Tell the text view we reset state on finish input
2013-05-30 04:55:31 -07:00
Jean Chalard
1a50999ed9
Merge "Tell the text view we reset state on finish input"
2013-05-30 11:53:50 +00:00
Jean Chalard
46b9bd068a
am faa7fbfa: Merge "Fix two strict mode warnings."
...
* commit 'faa7fbfaa27324608556699ab4c149d23e6a5f57':
Fix two strict mode warnings.
2013-05-30 04:23:59 -07:00
Jean Chalard
faa7fbfaa2
Merge "Fix two strict mode warnings."
2013-05-30 11:16:09 +00:00
Ken Wakasa
94da44e43e
Move additional_proximity_chars to the layout directory
...
Change-Id: Ie892ea9f3199a66e9d62a92a0e1ab2dff62826c3
2013-05-30 20:12:47 +09:00
Jean Chalard
e90d039e0c
Fix two strict mode warnings.
...
Bug: 9052555
Change-Id: I86e90488679a78a9f6e901b640025619293765a0
2013-05-30 20:12:05 +09:00
Ken Wakasa
f002debdfe
am 29432f84: Create a new directory for layout-related implementations
...
* commit '29432f843a8cd6ffb2be286104964592e80d77c9':
Create a new directory for layout-related implementations
2013-05-30 03:59:35 -07:00
Tadashi G. Takaoka
500a9752b1
Cleanup unreadable variable names
...
Change-Id: Ic97687c58e25e4b0c6833cc25d10854f5f513081
2013-05-30 19:49:51 +09:00
Tadashi G. Takaoka
653603b725
Separate SuggestionStripLayoutHelper for readablity
...
Change-Id: I82c749c6837c3af7ae290f4cd92f5426ca58b5c7
2013-05-30 19:49:20 +09:00
Ken Wakasa
29432f843a
Create a new directory for layout-related implementations
...
Change-Id: Ia227bb296f20dab0dfc03dfcde3a06c624eca76c
2013-05-30 19:45:53 +09:00
Jean Chalard
fd2f09aee8
am 8eb214d7: Merge "Fix dictionary pack preference order."
...
* commit '8eb214d7e198e25d48b56fa0a82b2861f817e23c':
Fix dictionary pack preference order.
2013-05-29 23:41:10 -07:00
Jean Chalard
8eb214d7e1
Merge "Fix dictionary pack preference order."
2013-05-30 06:38:27 +00:00
Baligh Uddin
73787ceaa2
Import translations. DO NOT MERGE
...
Change-Id: I4cd9c57839fe06e2555232074f84d21a45224baa
Auto-generated-cl: translation import
2013-05-29 23:03:48 -07:00
Jean Chalard
b3d150aa13
Fix dictionary pack preference order.
...
It turns out giving them in the right order is not enough, you
also have to actually give them a numeric priority.
Bug: 9165928
Change-Id: I2ecff38f65b70746feeeeb0ed2cc86a586a35363
2013-05-30 12:33:06 +09:00
Jean Chalard
b6822188fa
am ec9670ac: Merge "Rub some butter on dictionary list scrolling."
...
* commit 'ec9670ac3dfa74b81eff409fefa7460ce5175c4a':
Rub some butter on dictionary list scrolling.
2013-05-29 20:32:24 -07:00
Jean Chalard
ec9670ac3d
Merge "Rub some butter on dictionary list scrolling."
2013-05-30 03:31:05 +00:00
Keisuke Kuroyanagi
01d8810007
am 2ebe2009: Merge "Make DicTraverseSession having suggest options."
...
* commit '2ebe2009b393a6ff0aeeb4eeb8f39e7c19f016ba':
Make DicTraverseSession having suggest options.
2013-05-29 17:24:28 -07:00
Keisuke Kuroyanagi
2ebe2009b3
Merge "Make DicTraverseSession having suggest options."
2013-05-30 00:22:30 +00:00
Keisuke Kuroyanagi
338ef65077
Make DicTraverseSession having suggest options.
...
Change-Id: I2b802c06634e5226c763fd838f3fc0918fc4a161
2013-05-29 17:18:03 -07:00
Baligh Uddin
2d5e13ec31
am b4b72d43: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'b4b72d438b76e10e7e609f0d2a493ccf09ebb9e4':
Import translations. DO NOT MERGE
2013-05-29 15:17:16 -07:00
Baligh Uddin
b4b72d438b
Merge "Import translations. DO NOT MERGE"
2013-05-29 21:52:43 +00:00
Baligh Uddin
d88f050242
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-05-29 21:51:59 +00:00
Jean Chalard
68d9cb62e2
Tell the text view we reset state on finish input
...
This should be done in onFinishInput rather than onFinishInputView
but for an unknown reason onFinishInput never comes.
Bug: 9113167
Change-Id: Iafb40846a3ed8fad78bfc160d17cd431f81fe891
2013-05-29 18:44:40 +09:00
Jean Chalard
2b34b4eab6
Rub some butter on dictionary list scrolling.
...
The default implementation for preferences refuses to
cache the views for custom preferences at all. We can
do it, but the system won't do it for us, so this does it.
This makes the screen scrolling smooth again.
Incidentally it also fixes the bug where the button may
not animate on the first element.
Bug: 8882722
Bug: 8883108
Change-Id: I9b2306ac4bf93761a808ebfee3477a65f017cddf
2013-05-29 11:52:04 +09:00
Kurt Partridge
ce1d432c2d
am 305509ed: Merge "Remove unused method"
...
* commit '305509ed2feffa5c57cd21bb7cc137e444df3390':
Remove unused method
2013-05-28 18:38:03 -07:00
Kurt Partridge
305509ed2f
Merge "Remove unused method"
2013-05-29 01:36:27 +00:00
Kurt Partridge
b536e2ace5
Remove unused method
...
The removed method was used in old versions of ALK, never in master.
Change-Id: I607009d4fcca7c7c8493fee51ecd923e6a6b3890
2013-05-28 16:51:19 -07:00
Kurt Partridge
4acf46e3ad
am 215fabff: Merge "Rename containsCorrection to containsUserDeletions"
...
* commit '215fabff523b1399b4aafaa09476747561d2127b':
Rename containsCorrection to containsUserDeletions
2013-05-28 16:42:43 -07:00
Kurt Partridge
215fabff52
Merge "Rename containsCorrection to containsUserDeletions"
2013-05-28 23:41:26 +00:00
Kurt Partridge
315ab98007
Rename containsCorrection to containsUserDeletions
...
This change renames containsCorrection to avoid confusion with
CorrectionInfo, and to better clarify its meaning.
Change-Id: I5d8f8e2b03133c15a60d4e8b0f395cda1fff5447
2013-05-28 09:43:04 -07:00
Tadashi G. Takaoka
f4e557c941
am 94af6d9e: Merge "Make unit test independent from test device locale"
...
* commit '94af6d9e7f779fad4886d70fcac26844ecdc0c15':
Make unit test independent from test device locale
2013-05-28 04:49:29 -07:00
Tadashi G. Takaoka
2bd3883be4
am d99abf8c: Delete shared preference entry when user select default value
...
* commit 'd99abf8cb119ff2cb4e7d975001a939cc48d7112':
Delete shared preference entry when user select default value
2013-05-28 04:49:27 -07:00
Tadashi G. Takaoka
94af6d9e7f
Merge "Make unit test independent from test device locale"
2013-05-28 11:48:09 +00:00
Tadashi G. Takaoka
617cf2e537
am 58067bd9: Merge "Fix unit test assert helper method"
...
* commit '58067bd952a9c77b2deedd3b45bc1403c49b8c91':
Fix unit test assert helper method
2013-05-28 04:46:14 -07:00