Commit Graph

41266 Commits (e73e47f83f0340c0954f352395d53d934f972f95)

Author SHA1 Message Date
Xin Li 04035c9d20 Merge stage-dr1-aosp-master into stage-aosp-master
am: efeceaa60c

Change-Id: I900f02260278cdf2d28b77c57bbebddceeeb7fa7
2018-08-13 17:38:50 -07:00
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
Xin Li efeceaa60c Merge stage-dr1-aosp-master into stage-aosp-master
Bug: 112535855
Change-Id: Id6a0f71bed88d3d99c7155310c0079677a3473eb
2018-08-13 13:01:20 -07:00
TreeHugger Robot a5b3aa9913 Merge "Import translations. DO NOT MERGE" 2018-08-08 17:53:29 +00:00
Xin Li 08ff60e29e Merge "Merge Android Pie into master" am: 0b6bd00834 am: d88e3094de am: 0af05508c9
am: 43ce76b32d

Change-Id: Ibf2725024cb22d93bbd7d26940d5ff045082e932
2018-08-08 03:58:30 -07:00
Xin Li 43ce76b32d Merge "Merge Android Pie into master" am: 0b6bd00834 am: d88e3094de
am: 0af05508c9

Change-Id: Icadf7caebc9cf6313e028de0808fe3832ae99367
2018-08-07 23:05:29 -07:00
Xin Li 0af05508c9 Merge "Merge Android Pie into master" am: 0b6bd00834
am: d88e3094de

Change-Id: I7203fce3851ed0fc337bc7698a93965e1f3e9b7a
2018-08-07 18:45:43 -07:00
Bill Yi 15c37f8bab Import translations. DO NOT MERGE
Change-Id: Ie86b819785a70d5613155360f4551c77b6bf0fd0
Auto-generated-cl: translation import
2018-08-07 17:37:26 -07:00
Xin Li d88e3094de Merge "Merge Android Pie into master"
am: 0b6bd00834

Change-Id: I8af512fde2f06c3e5f5b111bef4f77ba97f6873c
2018-08-07 15:15:07 -07:00
Xin Li 0b6bd00834 Merge "Merge Android Pie into master" 2018-08-07 16:51:24 +00:00
Xin Li 1e882ed861 Merge Android Pie into master
Bug: 112104996
Change-Id: I80533e40e18491cbd2973f76b0712f5c7adf45e4
2018-08-06 16:51:30 -07:00
Bill Yi b5baa478d3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 7fee2eab02 -s ours am: bab98e72ad -s ours
am: 207db93a85  -s ours

Change-Id: I3afe89c6079c385c448719a4311aabdfb95fe40c
2018-08-04 18:22:39 -07:00
Bill Yi 0bd3ac8ad3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9a9aec3313 -s ours am: 205a2f40ba -s ours
am: ba6a80589e  -s ours

Change-Id: I66351f0e9c652b38533dd1dbbac4d22718fdc527
2018-08-04 18:22:01 -07:00
Bill Yi 27339f0d68 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c74fcad61b -s ours am: 5b294cccf9 -s ours
am: b1a318dbdd  -s ours

Change-Id: I98272b493f1c0a25aa362971f567ccea547445f8
2018-08-04 18:18:48 -07:00
Bill Yi 207db93a85 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 7fee2eab02 -s ours
am: bab98e72ad  -s ours

Change-Id: I5921c0032b6d3d28745cbb7e0c2ddf54a13232ef
2018-08-04 18:17:27 -07:00
Bill Yi ba6a80589e [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9a9aec3313 -s ours
am: 205a2f40ba  -s ours

Change-Id: Id001f3991859b1657cedce9f71257730340371a5
2018-08-04 18:17:08 -07:00
Bill Yi 0dfd41dd76 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 957b4da1b0 -s ours am: 5511368d7e -s ours
am: 845a8eeb0f  -s ours

Change-Id: I0ddb5004116a72c1993d25e7f41a0ba98af5550d
2018-08-04 18:14:52 -07:00
Bill Yi b1a318dbdd [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c74fcad61b -s ours
am: 5b294cccf9  -s ours

Change-Id: Ifc27631ac1ecfd7c86ecc18bab8e2cb207682351
2018-08-04 18:14:13 -07:00
Bill Yi 0589f7bbad [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 43f8f1d5fd -s ours am: 50ae03af3f -s ours
am: 95047f1460  -s ours

Change-Id: Iab9c68ed867d1d15d02b444e50b5ed9dd7044827
2018-08-04 18:14:13 -07:00
Bill Yi 845a8eeb0f [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 957b4da1b0 -s ours
am: 5511368d7e  -s ours

Change-Id: I0531e3400725a9a2eb73fb498d272ff0120c6cb5
2018-08-04 18:13:52 -07:00
Bill Yi bab98e72ad [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 7fee2eab02  -s ours

Change-Id: I114ae3091f30c50cc58b19e2e7e08c7d1d80bc75
2018-08-04 18:13:18 -07:00
Bill Yi 23de71030f [automerger skipped] Import translations. DO NOT MERGE am: 8289fb18bd -s ours am: 9f9f8d2bfc -s ours
am: c94450a42a  -s ours

Change-Id: I693057d4d5d9deca3f6edb909ce16e546019f541
2018-08-04 18:13:18 -07:00
Bill Yi 95047f1460 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 43f8f1d5fd -s ours
am: 50ae03af3f  -s ours

Change-Id: I0bbeaa7ff12db5ffa176811d2d27e9c6f8d2fc67
2018-08-04 18:13:16 -07:00
Bill Yi 205a2f40ba [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 9a9aec3313  -s ours

Change-Id: I1026d014d40831597ca14d94063c0cbabfb3a6e7
2018-08-04 18:12:59 -07:00
Bill Yi 5b294cccf9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: c74fcad61b  -s ours

Change-Id: I9d29babbf47cea1bfa32aafdb5dc77b5d5eda42e
2018-08-04 18:10:14 -07:00
Bill Yi 5511368d7e [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 957b4da1b0  -s ours

Change-Id: I52af21d975efe813b557f52e4646d7af629fe8c6
2018-08-04 18:09:54 -07:00
Bill Yi 50ae03af3f [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 43f8f1d5fd  -s ours

Change-Id: I39362f91cd4ee42e00108d384e4ecea3f55481cc
2018-08-04 18:09:09 -07:00
Bill Yi c94450a42a [automerger skipped] Import translations. DO NOT MERGE am: 8289fb18bd -s ours
am: 9f9f8d2bfc  -s ours

Change-Id: I95bcd60a80a85dd0b837acd5ae95e61ffe81ac27
2018-08-04 18:09:05 -07:00
TreeHugger Robot 7fee2eab02 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-08-05 01:07:03 +00:00
TreeHugger Robot 9a9aec3313 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-08-05 01:04:58 +00:00
Bill Yi 9f9f8d2bfc [automerger skipped] Import translations. DO NOT MERGE
am: 8289fb18bd  -s ours

Change-Id: I8fe27ee930f1052805cb61279e3b3c615f135e08
2018-08-04 18:04:34 -07:00
TreeHugger Robot c74fcad61b Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-08-05 01:02:13 +00:00
TreeHugger Robot 957b4da1b0 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-08-05 01:02:04 +00:00
TreeHugger Robot 43f8f1d5fd Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-08-05 01:01:41 +00:00
Bill Yi 8289fb18bd Import translations. DO NOT MERGE
Change-Id: Ia192cb1acf2491b2e5ab43c42afdac1f23417ef4
Auto-generated-cl: translation import
2018-08-04 08:26:59 -07:00
Bill Yi e63b60a2c2 Import translations. DO NOT MERGE
Change-Id: I3aa89ae1670744014b169157832143e462dfaf4f
Auto-generated-cl: translation import
2018-08-04 08:26:20 -07:00
Bill Yi 42e35ed64b Import translations. DO NOT MERGE
Change-Id: I72cb33f43c33497c1f022aee66c7b87cc46af6a8
Auto-generated-cl: translation import
2018-08-04 08:25:20 -07:00
Bill Yi 3b9c5cce7e Import translations. DO NOT MERGE
Change-Id: I8892576a36ac7ad3f113db815bfa5d85d3272f6f
Auto-generated-cl: translation import
2018-08-04 08:24:38 -07:00
Bill Yi 46a42a8a7b Import translations. DO NOT MERGE
Change-Id: Id73e068efeb13735eca3fd8009100ea4323e4129
Auto-generated-cl: translation import
2018-08-04 08:23:40 -07:00
Bill Yi 002961cdc0 Import translations. DO NOT MERGE
Change-Id: I0b1ba5a559b21086273b6aeb51a4594fd103f581
Auto-generated-cl: translation import
2018-08-04 08:22:39 -07:00
TreeHugger Robot 8d19c8cbf7 Merge "Import translations. DO NOT MERGE" 2018-08-02 05:34:55 +00:00
Bill Yi e2610221be Import translations. DO NOT MERGE
Change-Id: I4d394e997b58cd7dd2768861a3da887fdb7c1c6d
Auto-generated-cl: translation import
2018-08-01 20:27:35 -07:00
Bill Yi 7305b0b41e Import translations. DO NOT MERGE
Change-Id: Ifaf4318866c3ba72adee1190e0dfce8506fbd7b0
Auto-generated-cl: translation import
2018-08-01 20:27:24 -07:00
android-build-team Robot 02b6a5ac99 Snap for 4916303 from 992d47a237 to pi-qpr1-release
Change-Id: I9e6d882649e912cd49d6144d077d4eceed0df84d
2018-07-27 03:02:43 +00: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