The Android Automerger
2d2519d9e2
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-06-02 05:55:51 -07:00
Kurt Partridge
8160a21c3a
Uncommit an extra LogUnit
...
The period-generating double-space adds an extra LogUnit --
it must be removed when reverting.
Bug: 9088919
Change-Id: Ic148f40b4030a9b4a0651029bda87f7b94a52252
2013-06-02 00:02:38 -07:00
Kurt Partridge
720840851d
Uncommit LogUnits when reverting textInput
...
Bug: 9088919
Change-Id: I17187aa0afc1c3e9d32269c65f66cfb3a08663cb
2013-06-01 23:42:35 -07:00
Keisuke Kuroyanagi
88ad30f40b
Move dictionary format independent probability calculation methods to ProbabilityUtils.
...
Bug: 6669677
Change-Id: Idc09a2fbb04e4d843e11313011178022177616aa
2013-06-01 14:08:20 -07:00
Kurt Partridge
4165ef031f
Remove uncommit on reverting batch input
...
Currently when the user reverts a batch input, a LogUnit is uncommitted
from the LogBuffer. It should not be, because the LogUnit containing the
batch input is never committed in the first place (it is only committed
to the LogBuffer when a key is pressed or a new batch input is entered).
Bug: 9088919
Change-Id: I323af453ce082437a663ccae977b21b775a964bc
2013-06-01 11:15:47 -07:00
Baligh Uddin
d3ccd4bf22
Merge "Import translations. DO NOT MERGE"
2013-05-31 23:19:22 +00:00
Ken Wakasa
1dae936f23
Merge "Move char_utils to the dictionary directory"
2013-05-31 11:41:33 +00:00
Ken Wakasa
464d3ba432
Move char_utils to the dictionary directory
...
Change-Id: Id397485407fe63600c9bb5c80d223042942b4d8a
2013-05-31 20:39:34 +09:00
Jean Chalard
26f489493e
Fix the displayed status after download
...
Bug: 9166225
Change-Id: I7490593d88a5854b9e675b9ead89d2ea9b49315c
2013-05-31 20:28:15 +09:00
Jean Chalard
f61999caba
Merge "Make it easy to open several dictionaries from tests"
2013-05-31 11:21:37 +00:00
Tadashi G. Takaoka
a0c3e02d71
Refactor SuggestionStripLayoutHelper a bit
...
Bug: 9059710
Change-Id: Ief12029bad75d4dc78090ab97555aece01b873de
2013-05-31 18:14:47 +09:00
Tadashi G. Takaoka
70c2dcffa3
am 6f7e39a6
: am e7514a6a
: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
...
* commit '6f7e39a6827598492ffbfeedf4c47445519f272e':
Add vibration override values for Galaxy S4 and HTC One
2013-05-30 23:49:07 -07:00
Baligh Uddin
5989c9b810
am ea11a8ef
: (-s ours) am dee9d17c
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ea11a8ef4f6c2753b01bb80423abe0263bb1b7d3':
Import translations. DO NOT MERGE
2013-05-30 23:49:06 -07:00
Tadashi G. Takaoka
6f7e39a682
am e7514a6a
: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
...
* commit 'e7514a6a8a9e59ea5cde9f2c3a198f35d111cdc2':
Add vibration override values for Galaxy S4 and HTC One
2013-05-30 23:47:01 -07:00
Baligh Uddin
ea11a8ef4f
am dee9d17c
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'dee9d17c6855b9d34a9cd0e7946c5890a83a583b':
Import translations. DO NOT MERGE
2013-05-30 23:47:01 -07:00
Tadashi G. Takaoka
e7514a6a8a
Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
2013-05-31 06:45:07 +00:00
Jean Chalard
1562fc91f0
Make it easy to open several dictionaries from tests
...
Bug: 9127175
Change-Id: I3f1840ee73b364df26dfddb5acb10001e0f2cb61
2013-05-31 15:36:05 +09:00
Tadashi G. Takaoka
723391c945
Merge "Tidy up Utils class a bit"
2013-05-31 06:29:24 +00: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
e6125db98d
Merge "Catch a permission exception"
2013-05-31 00:30:14 +00: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
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
424a173db8
Merge "Move additional_proximity_chars to the layout directory"
2013-05-30 12:18:10 +00: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
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
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
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
ec9670ac3d
Merge "Rub some butter on dictionary list scrolling."
2013-05-30 03:31:05 +00: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
b4b72d438b
Merge "Import translations. DO NOT MERGE"
2013-05-29 21:52:43 +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
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
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
94af6d9e7f
Merge "Make unit test independent from test device locale"
2013-05-28 11:48:09 +00:00
Tadashi G. Takaoka
d99abf8cb1
Delete shared preference entry when user select default value
...
Change-Id: I3fbafd9024c26a99d87376f5d5e359e03988a30f
2013-05-28 20:44:25 +09:00
Tadashi G. Takaoka
58067bd952
Merge "Fix unit test assert helper method"
2013-05-28 11:44:16 +00:00