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
46a007261f
Merge "Fix some compiler warnings"
2014-10-21 15:06:55 +00:00
Keisuke Kuroyanagi
0b8bb0c21b
Fix debug build.
...
Change-Id: Id94636714d04a8828718b87741c0ee62a14cb3b4
2014-10-21 20:20:11 +09: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
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
fa1e65cb3a
Merge "Use EntryCounters during GC."
2014-10-21 07:55:04 +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
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
9ba36f29cc
Merge "Import translations. DO NOT MERGE"
2014-10-20 23:40:57 +00:00
Geoff Mendal
39bda3389e
Merge "Import translations. DO NOT MERGE"
2014-10-20 23:40:15 +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
0e4f83485c
Import translations. DO NOT MERGE
...
Change-Id: I1f98c40acd696c8791dd0e3850d3dcff6b51722b
Auto-generated-cl: translation import
2014-10-20 16:22:19 -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
b0ccf3a0a2
Refactor CustomInputStyleSettingsFragment
...
Bug: 18003991
Change-Id: Ib005dd394faf546e4faed89ff2018ce49858a06e
2014-10-20 17:12:33 +09:00
Keisuke Kuroyanagi
1085fef8d0
Change entry count limit.
...
Unigram 10K, Bigram 30K, Trigram 30K.
Change-Id: Ibd19c6a2b618499df1c70000bad7b47498187f0a
2014-10-20 15:01:49 +09:00
Baligh Uddin
101cdca729
am 965048d9
: (-s ours) am 2ffe6a23
: (-s ours) am d25f8443
: (-s ours) am 6a887105
: (-s ours) am c04edfc3
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '965048d992af142a3314726b738d43a96aec3764':
Import translations. DO NOT MERGE
2014-10-19 22:50:51 +00:00
Baligh Uddin
69d3d33fb0
am 5aa08a0b
: (-s ours) am 821db737
: (-s ours) am 93d67f65
: (-s ours) am 6949eb15
: (-s ours) am 815b31f9
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '5aa08a0b5a1346a7561b2ee70e277dc8c170ec5d':
Import translations. DO NOT MERGE
2014-10-19 22:50:50 +00:00
Baligh Uddin
7c6e3e015d
am 700ea8bb
: (-s ours) am 6912dc5f
: (-s ours) am ffd0f4d5
: (-s ours) am 6f1de7e5
: (-s ours) am cf1c95ec
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '700ea8bb7b9ee8ef20482475813c76aabc2d2943':
Import translations. DO NOT MERGE
2014-10-19 22:50:49 +00:00
Baligh Uddin
3d621475d4
am 6dc1b19b
: (-s ours) am 2d6832d8
: (-s ours) am 3b793b9b
: (-s ours) am d541cacf
: (-s ours) am be25b245
: (-s ours) Import translations. DO NOT MERGE
...
* commit '6dc1b19b8ee32dabf8726bbdde35156fa9ae7673':
Import translations. DO NOT MERGE
2014-10-19 22:50:48 +00:00
Baligh Uddin
965048d992
am 2ffe6a23
: (-s ours) am d25f8443
: (-s ours) am 6a887105
: (-s ours) am c04edfc3
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '2ffe6a2340ab05fb38f5051a1ce35b12af895fce':
Import translations. DO NOT MERGE
2014-10-19 22:44:08 +00:00
Baligh Uddin
5aa08a0b5a
am 821db737
: (-s ours) am 93d67f65
: (-s ours) am 6949eb15
: (-s ours) am 815b31f9
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '821db73793e5b6f779cada48a51a9740eb885fff':
Import translations. DO NOT MERGE
2014-10-19 22:44:06 +00:00
Baligh Uddin
700ea8bb7b
am 6912dc5f
: (-s ours) am ffd0f4d5
: (-s ours) am 6f1de7e5
: (-s ours) am cf1c95ec
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '6912dc5f33e152e3a0d6b8561dcf8cbcd5a4056c':
Import translations. DO NOT MERGE
2014-10-19 22:44:05 +00:00
Baligh Uddin
6dc1b19b8e
am 2d6832d8
: (-s ours) am 3b793b9b
: (-s ours) am d541cacf
: (-s ours) am be25b245
: (-s ours) Import translations. DO NOT MERGE
...
* commit '2d6832d8ff823372f4bf2ebc31ac71263b3a4320':
Import translations. DO NOT MERGE
2014-10-19 22:44:04 +00:00
Baligh Uddin
2ffe6a2340
am d25f8443
: (-s ours) am 6a887105
: (-s ours) am c04edfc3
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'd25f8443ebf3ec5adb28ae6e24c3d17f6a0bdf7b':
Import translations. DO NOT MERGE
2014-10-19 22:37:20 +00:00
Baligh Uddin
821db73793
am 93d67f65
: (-s ours) am 6949eb15
: (-s ours) am 815b31f9
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '93d67f65ac2d154a29dc7afdc6ae039b98fd07fd':
Import translations. DO NOT MERGE
2014-10-19 22:37:18 +00:00
Baligh Uddin
6912dc5f33
am ffd0f4d5
: (-s ours) am 6f1de7e5
: (-s ours) am cf1c95ec
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'ffd0f4d5e753c936455a7bedd6c6d83912ce6ae0':
Import translations. DO NOT MERGE
2014-10-19 22:37:17 +00:00
Baligh Uddin
2d6832d8ff
am 3b793b9b
: (-s ours) am d541cacf
: (-s ours) am be25b245
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3b793b9b5294f606cfb3533c0734026ee9e4890a':
Import translations. DO NOT MERGE
2014-10-19 22:37:16 +00:00
Baligh Uddin
d25f8443eb
am 6a887105
: (-s ours) am c04edfc3
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '6a8871058f857d12390a8887faac4fd2b08bd34c':
Import translations. DO NOT MERGE
2014-10-19 22:29:21 +00:00
Baligh Uddin
93d67f65ac
am 6949eb15
: (-s ours) am 815b31f9
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '6949eb15668dd099958fe7e00afcba448bb09aa1':
Import translations. DO NOT MERGE
2014-10-19 22:29:20 +00:00
Baligh Uddin
ffd0f4d5e7
am 6f1de7e5
: (-s ours) am cf1c95ec
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '6f1de7e5f1a1d75f85eb5c08186d4a9707ba16f1':
Import translations. DO NOT MERGE
2014-10-19 22:29:18 +00:00
Baligh Uddin
3b793b9b52
am d541cacf
: (-s ours) am be25b245
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd541cacff68f5b009a264721e3e2878d70aa65e2':
Import translations. DO NOT MERGE
2014-10-19 22:29:17 +00:00
Baligh Uddin
6a8871058f
am c04edfc3
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'c04edfc31c8e1538630fe3bff06928669d1e3869':
Import translations. DO NOT MERGE
2014-10-19 22:23:50 +00:00
Baligh Uddin
6949eb1566
am 815b31f9
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '815b31f9034dfe56b41852edcb87414db1d1d177':
Import translations. DO NOT MERGE
2014-10-19 22:23:49 +00:00
Baligh Uddin
6f1de7e5f1
am cf1c95ec
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'cf1c95ec2264a4dd08365ff6cdf97e92976c390c':
Import translations. DO NOT MERGE
2014-10-19 22:23:48 +00:00
Baligh Uddin
d541cacff6
am be25b245
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'be25b245f6320ed16fc77c5a09e15a7d15511702':
Import translations. DO NOT MERGE
2014-10-19 22:23:47 +00:00
Baligh Uddin
c04edfc31c
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-19 22:15:19 +00:00
Baligh Uddin
815b31f903
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-19 22:15:03 +00:00