Commit graph

40918 commits

Author SHA1 Message Date
Yohei Yukawa
d6525756a1 Add missing test runner annotations
These tests are supposed to run even withotu @RunWith annocation, but
for better consistency we should have it there.

Bug: 110805255
Test: verified as follows. No new test failures.
    tapas adb LatinIME LatinIMETests arm64 userdebug && \
    DISABLE_PROGUARD=true make -j LatinIME && \
    adb install -r $OUT/system/app/LatinIME/LatinIME.apk && \
    atest LatinIMETests:com.android.inputmethod.latin.ContactsDictionaryUtilsTest && \
    atest LatinIMETests:com.android.inputmethod.latin.ContactsContentObserverTest
Change-Id: I5c115d57b2ad41642f5f9b09b0c0d8f8c12480b0
2018-08-13 14:36:49 -07:00
Yohei Yukawa
c884b6631f Let Android Studio use 'shared' cert to build APK
make build uses 'shared' cert in build/make/target/product/security/.
If LatinIME APK built with AndroidStudio doesn't use the same signing
cert, then you cannot install the APK into AOSP image, which is not
convenient.

With this CL, AndroidStudio build also uses the same signing cert.

Note that shared.keystore was built as follows.

 $ openssl pkcs8 -inform DER -nocrypt                      \
   -in build/make/target/product/security/shared.pk8       \
   -out shared.pem
 $ openssl pkcs12 -export                                  \
   -in build/make/target/product/security/shared.x509.pem  \
   -inkey shared.pem -out shared.p12                       \
   -password pass:android -name AndroidDebugKey
 $ keytool -importkeystore -deststorepass android          \
   -destkeystore shared.keystore -srckeystore shared.p12   \
   -srcstoretype PKCS12 -srcstorepass android

Fix: 110741422
Test: made sure that the APK built with Android Studio can be
      installed to an AOSP build
Change-Id: I471a87e190b15ff02bb06849e4660ed7898897a5
2018-07-25 18:08:35 -07:00
Yohei Yukawa
e8d842b29f Experimentally Support Android Studio to build LatinIME
With this CL, you can build LatinIME and run tests for it on Android
Studio. This is still experimental and is not an official way to build
LatinIME though.

Bug: 110741422
Test: Made sure that you can build LatinIME with Android Studio
Change-Id: Ia75e3f74fa5f9b5f93dfac0b920c2e650aafa083
2018-07-25 18:08:28 -07:00
Yohei Yukawa
3d74fc73a8 Fix lint warnings in LatinIME JNI code
This CL addresses compiler warnings when building libjni_latinime.so
with NDK from Android Studio.

There should be no behavior change.

Bug: 110741422
Bug: 110757803
Test: tapas LatinIME LatinIMETests arm64 userdebug && make -j
Change-Id: Icc711dd46511a167b1fd90028552def5b2f9941f
2018-07-25 17:11:00 -07:00
Yohei Yukawa
41f89ae88c Specify version code in AndroidManifest.xml
This should be the most convenient way for both make build and Android
Studio build to share the same version code.

Bug: 110741422
Test: tapas LatinIME LatinIMETests arm64 userdebug && make -j
Change-Id: I35f850c392553b2640a4c3c7398441ac28e90eca
2018-07-25 17:08:47 -07:00
Yohei Yukawa
f4131e3f53 Deprecate host-side C++ test in LatinIME
Host-side C++ test in LatinIME is no longer actively used and is
actually not compatible with Android Studio build.

Let's just remove this for now.

Bug: 13754552
Bug: 110741422
Test: compile
Change-Id: I3e81285fe559022e1a296051036e74d2f2afbf9c
2018-07-25 14:38:58 -07:00
Yohei Yukawa
9cd42f39eb Move <uses-sdk /> to a differnt XML
Basically Android Studio does want targetSdkVersion to be specified in
build.gradle rather than AndroidManifest.xml.  To make both make build
and Android Studio build happy, this CL splits <uses-sdk /> from the
main AndroidManifest.xml to a different file and let them merged in
make build.

There should be no behavior change.

Bug: 110741422
Test: Manually verified that there is no difference in
      AndroidManifest.xml in the APK.
Change-Id: Ib673bca5a31b2f95329c9310a127ec0701bd8fdc
2018-07-25 14:21:09 -07:00
Yohei Yukawa
c0aa76f897 Migrate to Android Testing Support Lib (part 7/N)
InstrumentationTestCase and ActivityInstrumentationTestCase2 are
deprecated.  This CL rewrites tests that rely on those deprecated
classes by using Android Testing Support Library.

Bug: 110805255
Test: verified as follows. No new test failures.
    tapas adb LatinIME LatinIMETests arm64 userdebug && \
    DISABLE_PROGUARD=true make -j LatinIME && \
    adb install -r $OUT/system/app/LatinIME/LatinIME.apk && \
    atest LatinIMETests:com.android.inputmethod.keyboard.internal.MoreKeySpecStringReferenceTests LatinIMETests:com.android.inputmethod.latin.settings.AccountsSettingsFragmentTests
Change-Id: I4fefccaa0c480cfba7142ed36883da2f19b6a5f9
2018-07-24 11:29:20 -07:00
Yohei Yukawa
560a5bc596 Migrate to Android Testing Support Lib (part 6/N)
This is a follow up CL to previous CLs that converted unit tests to
use Android Testing Support Library but forgot to remove unused import
lines.

Bug: 110805255
Test: verified as follows. No new test failures.
        tapas adb LatinIME LatinIMETests arm64 userdebug && \
        DISABLE_PROGUARD=true make -j LatinIME && \
        adb install -r $OUT/system/app/LatinIME/LatinIME.apk && \
        atest LatinIMETests:com.android.inputmethod.latin
Change-Id: I8762b0dfc209bdf68867f725b03a22286026faae
2018-07-23 17:19:51 -07:00
Bill Yi
501ff64cfd Import translations. DO NOT MERGE
Change-Id: I55e880457966992e25acd30cc65390e80fa4a515
Auto-generated-cl: translation import
2018-07-21 20:50:09 -07:00
Bill Yi
0a3a44769b [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 992d47a237 -s ours
am: 601a2d4470  -s ours

Change-Id: Ifffbc7c8bc83312644ff3cd80c95939a4885358a
2018-07-20 12:08:54 -07:00
Bill Yi
601a2d4470 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 992d47a237  -s ours

Change-Id: I3d879d67ddd3b9dc78aa4101f3f2fe56c0e28cc4
2018-07-20 11:44:24 -07:00
TreeHugger Robot
992d47a237 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-07-20 18:36:38 +00:00
Bill Yi
b8c2d96903 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: a824eac6e2 -s ours
am: 9dee1ee20c  -s ours

Change-Id: I0c5ed4791574cc30ed3f10c3a782fe7f9e88332b
2018-07-20 11:33:11 -07:00
Bill Yi
4823a74cfb [automerger skipped] Import translations. DO NOT MERGE am: 1754bcd410 -s ours
am: 18a8bd1330  -s ours

Change-Id: I5578c306e1c7fbc6c56348c438be9df0c8c533d4
2018-07-20 11:32:07 -07:00
Bill Yi
9dee1ee20c [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: a824eac6e2  -s ours

Change-Id: I9c8cfe2b3d5e9636f8832644ceec19532ea78616
2018-07-20 11:28:59 -07:00
Bill Yi
18a8bd1330 [automerger skipped] Import translations. DO NOT MERGE
am: 1754bcd410  -s ours

Change-Id: I489f09027050fe62ebcd0ef1091ee48e1bb9a4ec
2018-07-20 11:28:03 -07:00
TreeHugger Robot
a824eac6e2 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-07-20 18:14:33 +00:00
Bill Yi
1754bcd410 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I0a07d63a0916cf33bbebcf68bd58bef0dfb91826
2018-07-19 21:21:33 -07:00
Bill Yi
315da31882 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ifffe3a45508e97013f768a0f7949cb2f8571acee
2018-07-19 21:20:48 -07:00
Bill Yi
b1d8302e3f Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Icc6eca523dd0cad7c8087aa0ede4edbd7ac9d748
2018-07-19 21:18:51 -07:00
Yohei Yukawa
d3b93cc950 Migrate to Android Testing Support Lib (part 5/N)
This CL converts 19 test classes under com.android.inputmethod.latin
to Android Testing Support Library.

Bug: 110805255
Test: verified as follows. No new test failures.
        tapas adb LatinIME LatinIMETests arm64 userdebug && \
        DISABLE_PROGUARD=true make -j LatinIME && \
        adb install -r $OUT/system/app/LatinIME/LatinIME.apk && \
        atest LatinIMETests:com.android.inputmethod.latin
Change-Id: I878fcae0126f57c43a644af341e5a0a8ac8f5cc9
2018-07-06 10:10:54 -07:00
Yohei Yukawa
a497886dda Migrate to Android Testing Support Lib (part 4/N)
This CL converts 7 test classes under com.android.inputmethod.keyboard
to Android Testing Support Library.

This CL also fix missing annotations in KeyboardLayoutTest.

Bug: 110805255
Test: verified as follows. No new test failures.
        tapas adb LatinIME LatinIMETests arm64 userdebug && \
        DISABLE_PROGUARD=true make -j LatinIME && \
        adb install -r $OUT/system/app/LatinIME/LatinIME.apk && \
        atest LatinIMETests:com.android.inputmethod.keyboard
Change-Id: I8ab9e3329f159f0df02812fafe44c25efa76c0d1
2018-07-06 10:09:43 -07:00
TreeHugger Robot
bba9005cb4 Merge "Migrate to Android Testing Support Lib (part 3/N)" 2018-07-06 03:02:21 +00:00
TreeHugger Robot
231a28a3f7 Merge "Migrate to Android Testing Support Lib (part 2/N)" 2018-07-06 03:02:05 +00:00
Yohei Yukawa
5fb15a463c Migrate to Android Testing Support Lib (part 3/N)
This CL converts the following 3 test cases to Android Testing Support
Library.
 * MoreKeysKeyboardBuilderAutoOrderTests
 * MoreKeysKeyboardBuilderFixedOrderTests
 * MoreKeysKeyboardBuilderMaxOrderTests

Bug: 110805255
Test: atest LatinIMETests:com.android.inputmethod.keyboard.MoreKeysKeyboardBuilderAutoOrderTests
Test: atest LatinIMETests:com.android.inputmethod.keyboard.MoreKeysKeyboardBuilderFixedOrderTests
Test: atest LatinIMETests:com.android.inputmethod.keyboard.MoreKeysKeyboardBuilderMaxOrderTests
Change-Id: I68d6c1901d4bb77bdc59d0be71eb565984fbd97d
2018-07-05 15:47:01 -07:00
Yohei Yukawa
9c49581eeb Migrate to Android Testing Support Lib (part 1/N)
This CL converts tests under com.android.inputmethod.latin.utils to
Android Testing Support Library.

Bug: 110805255
Test: verified as follows. No new test failures.
        tapas adb LatinIME LatinIMETests arm64 userdebug && \
        DISABLE_PROGUARD=true make -j LatinIME && \
        adb install -r $OUT/system/app/LatinIME/LatinIME.apk && \
        atest LatinIMETests:com.android.inputmethod.latin.utils
Change-Id: I5cc2ddbc4116003ab6407432ab521b6b560052ae
2018-07-05 13:45:04 -07:00
Yohei Yukawa
bfa5581857 Migrate to Android Testing Support Lib (part 2/N)
This CL converts tests under com.android.inputmethod.compat to
Android Testing Support Library.

Bug: 110805255
Test: verified as follows. No new test failures.
        tapas adb LatinIME LatinIMETests arm64 userdebug && \
        DISABLE_PROGUARD=true make -j LatinIME && \
        adb install -r $OUT/system/app/LatinIME/LatinIME.apk && \
        atest LatinIMETests:com.android.inputmethod.compat
Change-Id: I6766447ca27f5cccdb1e9f7e751235daa04cc252
2018-07-05 13:44:00 -07:00
Yohei Yukawa
2802250415 Remove unused class PersonalDictionaryLookup
PersonalDictionaryLookup has never been used.  Usually proguard can
remove this class but it also makes it difficult to run unit tests.

We should just remove this unused class.

Bug: 111164993
Test: compile
Test: No new test failure
Change-Id: I732db94cb3aac4ed9c6b5954679b896334a12a9c
2018-07-04 23:13:18 -07:00
Yohei Yukawa
f623196477 Add AndroidTest.xml for LatinIME
Fix: 111161344
Test: Manually tested as follows
        tapas adb LatinIME LatinIMETests arm64 userdebug && \
        DISABLE_PROGUARD=true make -j LatinIME && \
        adb install -r $OUT/system/app/LatinIME/LatinIME.apk && \
        atest LatinIMETests
Change-Id: If9f5691d5c624c9856acd31a3e1de307360d2c7c
2018-07-04 18:25:53 -07:00
TreeHugger Robot
416889655a Merge "Import translations. DO NOT MERGE" 2018-06-27 17:38:20 +00:00
TreeHugger Robot
b5e50dd6b5 Merge "Import translations. DO NOT MERGE" 2018-06-27 17:30:51 +00:00
Bill Yi
615a9ff532 Import translations. DO NOT MERGE
Change-Id: Ib1fbe9d70fcb60c19b0323490a6b8cb147e83bed
Auto-generated-cl: translation import
2018-06-27 08:51:02 -07:00
Bill Yi
eb5173e7b3 Import translations. DO NOT MERGE
Change-Id: I3494a9c6608aafc5406ca9a6f341983fe82feccc
Auto-generated-cl: translation import
2018-06-27 08:50:14 -07:00
Bill Yi
e58de4a04e Import translations. DO NOT MERGE
Change-Id: Ia3fb708923998222608c8c4de5617ee4ad6e936d
Auto-generated-cl: translation import
2018-06-27 08:48:22 -07:00
TreeHugger Robot
f1185e3120 Merge "Merge inputmethodcommon into LatinIME repo" 2018-06-25 16:24:57 +00:00
Yohei Yukawa
5b65f03cff Remove an unused layout file
This layout file was copied from Settings app but in LatinIME it has
never been used.  Also, android:onClick attributes in that layout file
are pointing to non-existing method in LatinIME, which causes lint
warnings.

Since tihs files has never been used in LatinIME, there should be no
user-visible behavior change.

Bug: 110757803
Test: tapas LatinIME && make -j
Change-Id: Ib51744979df333ac432aefc54ef7d0f413cf6161
2018-06-24 16:50:43 -07:00
Yohei Yukawa
733a0ea406 Merge inputmethodcommon into LatinIME repo
This is a preparation to deprecate frameworks/opt/inputmethodcommon
repository.

Currently repository 'inputmethodcommon' is used only from LatinIME.
Having such a repository only for one project is overkill.  Also, to
add gradle build support to LatinIME project, it would be much easier
LatinIME didn't have such a dependency.

This CL mechanically copies files in 'inputmethodcommon' repository to
'LatinIME' repository.  In theory there should be no behavior change.

Bug: 110741521
Test: tapas LatinIME && make -j
Change-Id: I3fabb038be9a944dcd9ef79ffcc89800a5f0bf5a
2018-06-24 15:52:36 -07:00
Bill Yi
97763ae8c8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 900a59f177 -s ours
am: da96495c86  -s ours

Change-Id: I14e5d966b8c80f2fcd183caac830f58be76f2611
2018-06-21 17:08:06 -07:00
Bill Yi
da96495c86 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 900a59f177  -s ours

Change-Id: If686cbc8844e0dd19d1f37b1012aa1159bafe78e
2018-06-21 17:05:17 -07:00
TreeHugger Robot
900a59f177 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-06-22 00:01:23 +00:00
Bill Yi
aa125d95ea [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 79f43db513 -s ours
am: 30b871c550  -s ours

Change-Id: Ic0aaf1b5f4a486cc9717c853002a80f6814a3b0b
2018-06-21 16:07:35 -07:00
Bill Yi
d0fd836f1b [automerger skipped] Import translations. DO NOT MERGE am: 3fc7472bcf -s ours
am: 6e78ee9f84  -s ours

Change-Id: I908e1bfe8568128f71a710d62c340effda6482f6
2018-06-21 16:03:18 -07:00
Bill Yi
30b871c550 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 79f43db513  -s ours

Change-Id: I7e2c2f6b4081255210a646b9023e9173f7130d56
2018-06-21 16:03:17 -07:00
Bill Yi
6e78ee9f84 [automerger skipped] Import translations. DO NOT MERGE
am: 3fc7472bcf  -s ours

Change-Id: I004f85a326da76a65c1d8fa8072ba719c5e42344
2018-06-21 16:00:38 -07:00
TreeHugger Robot
79f43db513 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-06-21 22:59:59 +00:00
Bill Yi
3fc7472bcf Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ifdefd11713addfc8ffedee5f65b9c842cbe3a435
2018-06-21 12:18:33 -07:00
Bill Yi
e0a1f83d8b Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I3a99b392b7d303bac6c0e702029642b75419a6cb
2018-06-21 12:17:47 -07:00
Bill Yi
d25ca81e5d Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8984bc6cf378f0efcbcb0e7a1d601614045c6d10
2018-06-21 12:15:36 -07:00
TreeHugger Robot
4569741c3f Merge "Import translations. DO NOT MERGE" 2018-06-20 22:08:13 +00:00