The Android Automerger
a01baf08e6
merge in ub-latinimegoogle-fava-release history after reset to f8bb245b47
2014-11-10 19:00:24 +00:00
Keisuke Kuroyanagi
f8bb245b47
am 91bdbcfc
: Merge "Make profiler use getTimeInMicroSec()."
...
* commit '91bdbcfc72e1f090ae149e15a29d46cfdc4537c6':
Make profiler use getTimeInMicroSec().
2014-11-10 18:15:49 +00:00
Keisuke Kuroyanagi
91bdbcfc72
Merge "Make profiler use getTimeInMicroSec()."
2014-11-10 18:13:23 +00:00
Keisuke Kuroyanagi
7d5420aa5e
Make profiler use getTimeInMicroSec().
...
Bug: 17797064
Change-Id: Ie992c9454edfc3bf93d5ea367c3a4427b513a205
2014-11-11 01:38:49 +09:00
Tadashi G. Takaoka
3372536dca
am a04380de
: Add more test cases to LanguageOnSpacebarHelperTests
...
* commit 'a04380de6a6bcf250f3f69f6fab43ed5e3bc8c91':
Add more test cases to LanguageOnSpacebarHelperTests
2014-11-09 04:25:17 +00:00
Tadashi G. Takaoka
a04380de6a
Add more test cases to LanguageOnSpacebarHelperTests
...
Change-Id: I54a4b89db84bbbd6bc7f5886f27b8bb6429ca8db
2014-11-08 18:24:54 -08:00
Tadashi G. Takaoka
6b11e3d9d5
am 2aec9189
: Merge "Rename unit test"
...
* commit '2aec9189f877432d33edfe9913eb579337e75e69':
Rename unit test
2014-11-09 02:00:13 +00:00
Tadashi G. Takaoka
2aec9189f8
Merge "Rename unit test"
2014-11-09 01:54:02 +00:00
Tadashi G. Takaoka
609ee38e29
Rename unit test
...
Change-Id: I0d18562a0b036a3e76a6df989a143bb05f0ed833
2014-11-08 17:46:59 -08:00
Keisuke Kuroyanagi
5ac16f6c97
am 61280c0b
: Merge "Add CommandExecutor for dicttoolkit."
...
* commit '61280c0b7fc87cf901272f38b75d12c5193b33ff':
Add CommandExecutor for dicttoolkit.
2014-11-08 21:39:57 +00:00
Keisuke Kuroyanagi
61280c0b7f
Merge "Add CommandExecutor for dicttoolkit."
2014-11-08 21:36:25 +00:00
Keisuke Kuroyanagi
bd48963bdf
Add CommandExecutor for dicttoolkit.
...
Bug: 10059681
Change-Id: I90334caaf37c84ce7d1b93d12efbfb5f244a9420
2014-11-09 06:22:28 +09:00
Keisuke Kuroyanagi
7f19c201a7
am d2a47cce
: Merge "Introduce CommandUtils for dicttoolkit"
...
* commit 'd2a47cceb290769e2c1c38ee3b77c9413ff0af3e':
Introduce CommandUtils for dicttoolkit
2014-11-08 01:17:18 +00:00
Keisuke Kuroyanagi
d2a47cceb2
Merge "Introduce CommandUtils for dicttoolkit"
2014-11-08 01:08:37 +00:00
Keisuke Kuroyanagi
4bfa3b273e
Introduce CommandUtils for dicttoolkit
...
Bug: 10059681
Change-Id: Ic6947e76d77dc87bf88dc3a2b749e41fae7553b7
2014-11-08 09:58:26 +09:00
Sandeep Siddhartha
1397abd81f
am b050b458
: am b8893c04
: am d4662983
: Fix restore from keyboard automerge: e551539
...
* commit 'b050b458dc1eac06412d116d6b57b849d3ccb06d':
Fix restore from keyboard
2014-11-07 19:00:04 +00:00
Sandeep Siddhartha
b050b458dc
am b8893c04
: am d4662983
: Fix restore from keyboard automerge: e551539
...
* commit 'b8893c044df4e3cdcb8aeafe7ab4fc8b3a626049':
Fix restore from keyboard
2014-11-07 18:55:00 +00:00
Sandeep Siddhartha
b8893c044d
am d4662983
: Fix restore from keyboard automerge: e551539
...
* commit 'd4662983d87d6d2ef2361e9053a29d6e5fb8d16e':
Fix restore from keyboard
2014-11-07 18:48:35 +00:00
Sandeep Siddhartha
d4662983d8
Fix restore from keyboard
...
automerge: e551539
* commit 'e5515395f11ce3f6ba5ddebb1fc029c51f51b8b3':
Fix restore from keyboard
2014-11-07 18:43:17 +00:00
Tadashi G. Takaoka
23bde31a5a
am 52a87a4c
: Merge "Clean up KeyboardLayoutSet a bit"
...
* commit '52a87a4cc3b8ab1bda15b21cc1749d3a8addd45f':
Clean up KeyboardLayoutSet a bit
2014-11-07 18:33:00 +00:00
Tadashi G. Takaoka
74346c0ba9
am ec0d6bb9
: Merge "Move current subtype management code to RichInputMethodManager"
...
* commit 'ec0d6bb9b708070c71981021712dfad0352a4cfe':
Move current subtype management code to RichInputMethodManager
2014-11-07 18:32:57 +00:00
Tadashi G. Takaoka
52a87a4cc3
Merge "Clean up KeyboardLayoutSet a bit"
2014-11-07 18:02:48 +00:00
Tadashi G. Takaoka
ec0d6bb9b7
Merge "Move current subtype management code to RichInputMethodManager"
2014-11-07 18:02:22 +00:00
Baligh Uddin
db6d42a078
am 96d558cc
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '96d558cc191fdad33ed85211dc84420d4746d75f':
Import translations. DO NOT MERGE
2014-11-07 15:00:44 +00:00
Baligh Uddin
c4e3ac702a
am 73c80e67
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '73c80e678e13df5eb78e49d37c1c8084bddb9c2e':
Import translations. DO NOT MERGE
2014-11-07 15:00:42 +00:00
Baligh Uddin
96d558cc19
Merge "Import translations. DO NOT MERGE"
2014-11-07 14:55:21 +00:00
Baligh Uddin
7cfea95655
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2014-11-07 14:55:14 +00:00
Baligh Uddin
73c80e678e
Merge "Import translations. DO NOT MERGE"
2014-11-07 14:55:07 +00:00
Jean Chalard
432d03ee08
am 5c4f642d
: Merge "Move util classes under common"
...
* commit '5c4f642df61b8672b1aa913992b981284f07eba7':
Move util classes under common
2014-11-07 10:00:55 +00:00
Jean Chalard
b6351d4454
am b2d263aa
: Merge "Fix tests"
...
* commit 'b2d263aae64d7c5221d9b026be279408f7135d9d':
Fix tests
2014-11-07 10:00:53 +00:00
Jean Chalard
5c4f642df6
Merge "Move util classes under common"
2014-11-07 09:15:35 +00:00
Jean Chalard
b2d263aae6
Merge "Fix tests"
2014-11-07 09:14:38 +00:00
Jean Chalard
75f0ab69bb
Fix tests
...
Oops.
Change-Id: Ib7c8c8284b55a6a6db5b5806ff40188fd06b57fb
2014-11-07 18:02:13 +09:00
Jean Chalard
5b91b551e5
Move util classes under common
...
Also why did we have two copies of LocaleUtils >.>
Bug: 18108776
Change-Id: I03b4403dfd51934e66b567f2f8b87da419cfb3ab
2014-11-07 18:00:03 +09:00
Jean Chalard
e96f2a2afb
am e0c2e5b2
: Merge "Remove a deprecated constructor to SuggestedWords"
...
* commit 'e0c2e5b2f731d612df5005c770ddd8cf47180e19':
Remove a deprecated constructor to SuggestedWords
2014-11-07 08:52:25 +00:00
Jean Chalard
e0c2e5b2f7
Merge "Remove a deprecated constructor to SuggestedWords"
2014-11-07 08:49:26 +00:00
Jean Chalard
c3e211bd6b
Remove a deprecated constructor to SuggestedWords
...
Change-Id: If4d358b3a11fb25fc214c728269519d8c25f9adc
2014-11-07 16:40:24 +09:00
Tadashi G. Takaoka
d134eb2b7e
am 72866677
: Merge "Move shorcut IME related code from SubtypeSwitcher to RichInputMethodManager"
...
* commit '7286667754f516ae24e34e033f15e9f5b6fcd279':
Move shorcut IME related code from SubtypeSwitcher to RichInputMethodManager
2014-11-07 06:23:46 +00:00
Tadashi G. Takaoka
7286667754
Merge "Move shorcut IME related code from SubtypeSwitcher to RichInputMethodManager"
2014-11-07 06:20:07 +00:00
Jean Chalard
8c6c5a1ffc
am 51d0b335
: Merge "Remove a useless method."
...
* commit '51d0b3351b2530173cdf73d1a9b364c916583999':
Remove a useless method.
2014-11-07 06:03:35 +00:00
Jean Chalard
c1fefd2018
am 536bf616
: Merge "Remove dicttool dependency to NativeSuggestOptions"
...
* commit '536bf61658fbd1f541824f6020493dc8816c8349':
Remove dicttool dependency to NativeSuggestOptions
2014-11-07 06:03:33 +00:00
Jean Chalard
51d0b3351b
Merge "Remove a useless method."
2014-11-07 06:00:54 +00:00
Jean Chalard
536bf61658
Merge "Remove dicttool dependency to NativeSuggestOptions"
2014-11-07 06:00:40 +00:00
Sandeep Siddhartha
e5515395f1
Fix restore from keyboard
...
The keyboard starts up before the restore process and the default shared
preferences are cached and used even after the restore.
Bug: 17837918
Change-Id: I2669e377b6e95813657fd6a80fbff4472330e3aa
(cherry picked from commit e9d814674b
)
2014-11-07 02:54:14 +00:00
Tadashi G. Takaoka
c5aefe7d7b
am 6e61cd3b
: Merge "Move some methods out from SubtypeSwitcher"
...
* commit '6e61cd3b3ba8853513b9d0167e76d670ae31a7f1':
Move some methods out from SubtypeSwitcher
2014-11-06 23:58:07 +00:00
Sandeep Siddhartha
1d2fadbe07
am 35bb12e0
: Merge "Fix restore from keyboard"
...
* commit '35bb12e010cee0496c5a08e8d7838575ba24f795':
Fix restore from keyboard
2014-11-06 23:58:05 +00:00
Tadashi G. Takaoka
6e61cd3b3b
Merge "Move some methods out from SubtypeSwitcher"
2014-11-06 23:40:06 +00:00
Sandeep Siddhartha
35bb12e010
Merge "Fix restore from keyboard"
2014-11-06 21:41:03 +00:00
Tadashi G. Takaoka
7fb0ed58ed
Move current subtype management code to RichInputMethodManager
...
Change-Id: I82d5a17a5ec96f26047d29e79f3f28850fc5b3bb
2014-11-06 11:51:07 -08:00
Tadashi G. Takaoka
8a2c4afad4
Move shorcut IME related code from SubtypeSwitcher to RichInputMethodManager
...
Change-Id: I0f95f603d80570c937e8c38ded88df341c11795e
2014-11-06 11:51:07 -08:00