Keisuke Kuroyanagi
1249395563
Merge "Support ngram entry migration."
2014-10-22 02:36:52 +00:00
Keisuke Kuroyanagi
c9865785f4
Support ngram entry migration.
...
Bug: 14425059
Change-Id: I98cb9fa303af2d93a0a3512e8732231c564e3c5d
2014-10-22 11:31:16 +09:00
Yohei Yukawa
1588956f7c
am baecaa54
: Merge "Remove BuildCompatUtils.VERSION_CODES_LXX"
...
* commit 'baecaa54114300dd2b3aceff480895bf1e42746f':
Remove BuildCompatUtils.VERSION_CODES_LXX
2014-10-22 02:08:04 +00:00
Yohei Yukawa
baecaa5411
Merge "Remove BuildCompatUtils.VERSION_CODES_LXX"
2014-10-22 02:01:32 +00:00
Yohei Yukawa
f9c8a44bbe
am 63cbdf49
: Add @Override for a method that is overriding a new L API
...
* commit '63cbdf49b91d2b588de71538afd20d1d34fc1746':
Add @Override for a method that is overriding a new L API
2014-10-21 16:37:54 +00:00
Yohei Yukawa
66d30a4b22
Remove BuildCompatUtils.VERSION_CODES_LXX
...
Finally it is turned out to be a XXL-size Lollipop.
Change-Id: Icbd22506be9de514eba287cdd8d97fbfd070ac09
2014-10-22 01:29:58 +09:00
Yohei Yukawa
63cbdf49b9
Add @Override for a method that is overriding a new L API
...
Now all the downstream builds have switched to API Level 21.
Hence putting @Override to new APIs no longer makes javac unhappy.
Change-Id: Ib3324a5d06b17d298beacab8c8802bb14e5be968
2014-10-22 01:28:10 +09:00
Tadashi G. Takaoka
d94645097a
am 46a00726
: Merge "Fix some compiler warnings"
...
* commit '46a007261fcbfbe887e22ecdf16307f95b1e4024':
Fix some compiler warnings
2014-10-21 15:10:07 +00:00
Tadashi G. Takaoka
46a007261f
Merge "Fix some compiler warnings"
2014-10-21 15:06:55 +00:00
Keisuke Kuroyanagi
20ae86172e
am 0b8bb0c2
: Fix debug build.
...
* commit '0b8bb0c21bda18e77a52d980891d56430e113a6f':
Fix debug build.
2014-10-21 11:32:35 +00:00
Keisuke Kuroyanagi
0b8bb0c21b
Fix debug build.
...
Change-Id: Id94636714d04a8828718b87741c0ee62a14cb3b4
2014-10-21 20:20:11 +09:00
Keisuke Kuroyanagi
96b059cf0c
am dfc82fa3
: Merge changes I210acb81,Ie9508788
...
* commit 'dfc82fa3662e3e7a157f20db974b3cef402a9dd0':
Make NgramProperty have NgramContext.
Create .cpp file for NgramContext.
2014-10-21 10:32:09 +00:00
Tadashi G. Takaoka
5f00fe09e9
Fix some compiler warnings
...
This CL fixes the following compiler warnings.
- Indirect access to static member
- Access to a non-accessible member of an enclosing type
- Parameter assignment
- Method can be static
- Local variable declaration hides another field or variable
- Value of local variable is not used
- Unused import
- Unused private member
- Unnecessary 'else' statement
- Unnecessary declaration of throw exception
- Redundant type arguments
- Missing '@Override' annotation
- Unused '@SuppressWarning' annotations
Bug: 18003991
Change-Id: Icfebe753e53a2cc621848f769d6a3d7ce501ebc7
2014-10-21 19:28:37 +09:00
Keisuke Kuroyanagi
dfc82fa366
Merge changes I210acb81,Ie9508788
...
* changes:
Make NgramProperty have NgramContext.
Create .cpp file for NgramContext.
2014-10-21 10:28:25 +00:00
Tadashi G. Takaoka
cfab30306c
am 2105aa3e
: Merge "FIx potential NPE"
...
* commit '2105aa3ea64ddf9cb0428d2bc717ff6fce12733e':
FIx potential NPE
2014-10-21 09:19:25 +00:00
Tadashi G. Takaoka
2105aa3ea6
Merge "FIx potential NPE"
2014-10-21 08:14:46 +00:00
Keisuke Kuroyanagi
88bb28c132
Make NgramProperty have NgramContext.
...
Bug: 14425059
Change-Id: I210acb816b122857dbbe1ee4dd6a35c5335bf2bf
2014-10-21 17:12:32 +09:00
Keisuke Kuroyanagi
f87bb77a91
Create .cpp file for NgramContext.
...
Bug: 14425059
Change-Id: Ie950878817b9c80cc9c970e1a84880c9b9ab228a
2014-10-21 17:04:56 +09:00
Keisuke Kuroyanagi
2359c54441
am fa1e65cb
: Merge "Use EntryCounters during GC."
...
* commit 'fa1e65cb3a5dcce6299a6dd067cee95720107307':
Use EntryCounters during GC.
2014-10-21 07:59:12 +00:00
Keisuke Kuroyanagi
fa1e65cb3a
Merge "Use EntryCounters during GC."
2014-10-21 07:55:04 +00:00
Adrian Velicu
e5e722210e
am c51b9b5b
: Merge "Renaming "blacklist" flag to "possibly offensive""
...
* commit 'c51b9b5b3f9b9b80d07186691ddfa09502fd4659':
Renaming "blacklist" flag to "possibly offensive"
2014-10-21 07:42:26 +00:00
Adrian Velicu
c51b9b5b3f
Merge "Renaming "blacklist" flag to "possibly offensive""
2014-10-21 07:39:18 +00:00
Keisuke Kuroyanagi
47fc656cd7
Use EntryCounters during GC.
...
Bug: 14425059
Change-Id: I61eb798686dc753fb6c0fe99a0719c1732198f30
2014-10-21 16:36:03 +09:00
Keisuke Kuroyanagi
d0604f841d
am 2b087f9a
: Merge "Introduce EntryCounters to count entries in a dictionary."
...
* commit '2b087f9a12d8bae2bd3adc659684df615e1c96db':
Introduce EntryCounters to count entries in a dictionary.
2014-10-21 07:10:51 +00:00
Keisuke Kuroyanagi
2b087f9a12
Merge "Introduce EntryCounters to count entries in a dictionary."
2014-10-21 07:07:23 +00:00
Keisuke Kuroyanagi
e8750d970e
Introduce EntryCounters to count entries in a dictionary.
...
Bug: 14425059
Change-Id: Ic13ba827d96fa4a147485ba92fdb37e23e04e8e8
2014-10-21 15:46:14 +09:00
Tadashi G. Takaoka
097bcdcde8
FIx potential NPE
...
Bug: 18052047
Change-Id: I9097d0a504b8a1d875cf66e44bb65eb6ecc8908e
2014-10-21 14:13:27 +09:00
Adrian Velicu
05172bf1a5
Renaming "blacklist" flag to "possibly offensive"
...
No behaviour changes.
Unified the overloaded FusionDictionary::add method to always take an
isPossiblyOffensive argument.
Bug: 11031090
Change-Id: I5741a023ca1ce842d2cf10d4f6c926b0efabaa78
2014-10-21 11:51:47 +09:00
Geoff Mendal
e93896822d
am 9ba36f29
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '9ba36f29cc8e897720f6654d89118127bf90dc5d':
Import translations. DO NOT MERGE
2014-10-20 23:43:48 +00:00
Geoff Mendal
ced08db509
am 39bda338
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '39bda3389e54bd1841360679e1907d638ef50600':
Import translations. DO NOT MERGE
2014-10-20 23:43:46 +00:00
Geoff Mendal
9ba36f29cc
Merge "Import translations. DO NOT MERGE"
2014-10-20 23:40:57 +00:00
Geoff Mendal
052f2a434a
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2014-10-20 23:40:46 +00:00
Geoff Mendal
39bda3389e
Merge "Import translations. DO NOT MERGE"
2014-10-20 23:40:15 +00:00
Geoff Mendal
cbcd64be8e
am 5df9f333
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '5df9f333a1ccd2004dbd5bb5ebe74dfa308caa2c':
Import translations. DO NOT MERGE
2014-10-20 23:40:12 +00:00
Geoff Mendal
40640178fa
am e7cb59a9
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'e7cb59a97fa745e4919006f0c34a76b30ac0a438':
Import translations. DO NOT MERGE
2014-10-20 23:40:11 +00:00
Geoff Mendal
fdc51500a2
am f422245c
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'f422245ca291d53bacfbb06711aba2aafa037386':
Import translations. DO NOT MERGE
2014-10-20 23:40:09 +00:00
Geoff Mendal
d5380f69a6
am 319d0a2e
: (-s ours) Import translations. DO NOT MERGE
...
* commit '319d0a2e366a59c6dc695d60b1ca90c0de0351e8':
Import translations. DO NOT MERGE
2014-10-20 23:40:08 +00:00
Geoff Mendal
5df9f333a1
Merge "Import translations. DO NOT MERGE"
2014-10-20 23:37:48 +00:00
Geoff Mendal
e7cb59a97f
Merge "Import translations. DO NOT MERGE"
2014-10-20 23:37:25 +00:00
Geoff Mendal
f422245ca2
Merge "Import translations. DO NOT MERGE"
2014-10-20 23:37:16 +00:00
Geoff Mendal
f459d3bb3b
Import translations. DO NOT MERGE
...
Change-Id: Idcaf9d1a640e52e64957db9ae1b6d24beabc5bfc
Auto-generated-cl: translation import
2014-10-20 16:27:32 -07:00
Geoff Mendal
82a0afe629
Import translations. DO NOT MERGE
...
Change-Id: I7cba6073f94f23aa5df47e9117ff744270a5dcdb
Auto-generated-cl: translation import
2014-10-20 16:26:32 -07:00
Geoff Mendal
0e4f83485c
Import translations. DO NOT MERGE
...
Change-Id: I1f98c40acd696c8791dd0e3850d3dcff6b51722b
Auto-generated-cl: translation import
2014-10-20 16:22:19 -07:00
Geoff Mendal
59048cbcfd
Import translations. DO NOT MERGE
...
Change-Id: I0725425d834b9479f59f0ca1908d234589d6813b
Auto-generated-cl: translation import
2014-10-20 16:18:30 -07:00
Geoff Mendal
c9dcc13a54
Import translations. DO NOT MERGE
...
Change-Id: Ic0556705ea72f60c0f66ed1c516636fc0f8c98ba
Auto-generated-cl: translation import
2014-10-20 16:15:42 -07:00
Geoff Mendal
ceb27e0d8e
Import translations. DO NOT MERGE
...
Change-Id: Ief1756f262798b3ababa8ccc57c386c2d08d4e68
Auto-generated-cl: translation import
2014-10-20 16:14:26 -07:00
Geoff Mendal
efdb314d6a
Import translations. DO NOT MERGE
...
Change-Id: I2b2849dd412ec9cc7330d882d8d1546932e753a4
Auto-generated-cl: translation import
2014-10-20 16:13:10 -07:00
Geoff Mendal
319d0a2e36
Import translations. DO NOT MERGE
...
Change-Id: Ie1921e02997556ddcff58bd492879a5b755536a9
Auto-generated-cl: translation import
2014-10-20 16:11:12 -07:00
Tadashi G. Takaoka
0b07ddc10c
am b0ccf3a0
: Refactor CustomInputStyleSettingsFragment
...
* commit 'b0ccf3a0a2d8bad1762ed7f3e0654b888d61114c':
Refactor CustomInputStyleSettingsFragment
2014-10-20 09:30:40 +00:00
Tadashi G. Takaoka
b0ccf3a0a2
Refactor CustomInputStyleSettingsFragment
...
Bug: 18003991
Change-Id: Ib005dd394faf546e4faed89ff2018ce49858a06e
2014-10-20 17:12:33 +09:00