Commit graph

14447 commits

Author SHA1 Message Date
TreeHugger Robot
624bac2cd8 Merge "Import translations. DO NOT MERGE" into pi-dev 2019-02-21 18:36:34 +00:00
TreeHugger Robot
a921223fe2 Merge "Import translations. DO NOT MERGE" into pi-dev 2019-02-21 18:32:55 +00:00
TreeHugger Robot
01900e65fc Merge "Import translations. DO NOT MERGE" into pi-dev 2019-02-21 18:30:35 +00:00
TreeHugger Robot
e951835344 Merge "Import translations. DO NOT MERGE" into pi-dev 2019-02-21 18:29:46 +00:00
TreeHugger Robot
35ac417ae0 Merge "Import translations. DO NOT MERGE" into pi-dev 2019-02-21 18:23:15 +00:00
Bill Yi
9e73c487e4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I2b984642494033f59d02cf4c640793b47e63c6b3
2019-02-21 06:21:12 -08:00
Bill Yi
141c72a1dc Import translations. DO NOT MERGE
Change-Id: I48a6f3055d8dd3182ff98a6edace3a4e35b4326d
Auto-generated-cl: translation import
2019-02-21 06:20:27 -08:00
Bill Yi
621f24c948 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I7809654384cc42e87999e222316e25f4bd70641f
2019-02-21 06:17:52 -08:00
Bill Yi
49f35d15be Import translations. DO NOT MERGE
Change-Id: Icdaeac3123fef5ca97a44cc155d4f428138ae985
Auto-generated-cl: translation import
2019-02-21 06:17:12 -08:00
Bill Yi
463afb44e2 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I136d94f85222806b5104a16b6d544dc1c377c5e3
2019-02-21 06:12:24 -08:00
Bill Yi
c57cda4a3a Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6e496165fde5ea66dda1559f39a0c02c949265b0
2019-02-21 06:08:02 -08:00
Bill Yi
58f382cb84 Import translations. DO NOT MERGE
Change-Id: Iaaf42624b7933d8a479a9eea71aedbc3711de6cb
Auto-generated-cl: translation import
2019-02-21 06:06:58 -08:00
Bill Yi
42f8490ea3 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ied44fc2e6b9256a6744387ca511946b21fd44524
2019-02-21 06:04:26 -08:00
Bill Yi
685f412885 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9edb7e3ebf58bdf8fe5b12096c37815e58a39e40
2019-02-21 06:01:44 -08:00
Bill Yi
f82540f2d4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I05cf27d7d1a197dde37d6dc69433c26e62c88458
2019-02-21 05:59:00 -08:00
Bill Yi
ba59aeb8e1 Import translations. DO NOT MERGE
Change-Id: I3962401c95664f199216b443e27bf07871b20d07
Auto-generated-cl: translation import
2019-02-21 05:58:22 -08:00
Bill Yi
1a39f585b1 Import translations. DO NOT MERGE
Change-Id: If684531601502dce2fa4c0fe36a1af2086226faa
Auto-generated-cl: translation import
2019-02-07 20:57:21 -08:00
TreeHugger Robot
a55797bfba Merge "Import translations. DO NOT MERGE" 2019-02-02 17:39:35 +00:00
TreeHugger Robot
5efe640eee Merge "Import translations. DO NOT MERGE" 2019-02-02 17:39:33 +00:00
TreeHugger Robot
90026f50fb Merge "Import translations. DO NOT MERGE" 2019-02-02 17:36:35 +00:00
TreeHugger Robot
c4918159e8 Merge "Import translations. DO NOT MERGE" 2019-02-02 17:34:39 +00:00
TreeHugger Robot
0b66f7e9ff Merge "Import translations. DO NOT MERGE" 2019-02-02 17:32:37 +00:00
TreeHugger Robot
f9bab82514 Merge "Import translations. DO NOT MERGE" 2019-02-02 17:29:40 +00:00
Bill Yi
21ac0441c7 Import translations. DO NOT MERGE
Change-Id: I58ea73335befe5324077a7775c4ff78f04ed1a4b
Auto-generated-cl: translation import
2019-02-02 00:51:47 -08:00
Bill Yi
3352776929 Import translations. DO NOT MERGE
Change-Id: I09408d72060cc69d3734647abe7969528539c1cc
Auto-generated-cl: translation import
2019-02-02 00:51:41 -08:00
Bill Yi
0bf41fa9bc Import translations. DO NOT MERGE
Change-Id: Ide4b5b729b9a7b482cfbd2aff914c3064f5ec668
Auto-generated-cl: translation import
2019-02-02 00:51:34 -08:00
Bill Yi
173fc8d243 Import translations. DO NOT MERGE
Change-Id: Ie30d0bb36cd7157921f3745fe722f7c0c458e92f
Auto-generated-cl: translation import
2019-02-02 00:51:27 -08:00
Bill Yi
b56eb6676f Import translations. DO NOT MERGE
Change-Id: Id25f8e0d7b2bb7c47e9f04e6355a10f2da9f9b25
Auto-generated-cl: translation import
2019-02-02 00:51:21 -08:00
Bill Yi
a6b9015e52 Import translations. DO NOT MERGE
Change-Id: I782e5d547025d56f98fc6a972c205367fa9e7bca
Auto-generated-cl: translation import
2019-02-02 00:51:13 -08:00
Bill Yi
0294f8c213 Import translations. DO NOT MERGE
Change-Id: I51b7669e416dce6ccf73724110d9ed446e0f2940
Auto-generated-cl: translation import
2019-02-02 00:51:05 -08:00
Bill Yi
3153a23cba Import translations. DO NOT MERGE
Change-Id: I9612b424937fd60ea265f2276d5a53ebe332afb9
Auto-generated-cl: translation import
2019-01-28 22:24:16 -08:00
Anton Hansson
575340c674 Merge "Move LatinIME and its lib to /product" am: 149b9d4f6e am: 84d156b1e6
am: d894eec1ee

Change-Id: Ib7cdb0007c22934f7736cd02c02e0f9358f889d4
2019-01-14 02:11:11 -08:00
Anton Hansson
d894eec1ee Merge "Move LatinIME and its lib to /product" am: 149b9d4f6e
am: 84d156b1e6

Change-Id: I386b9b5ed6ba02a4cd00efb75804ffef24603a2c
2019-01-14 01:56:34 -08:00
TreeHugger Robot
06c8063be0 Merge "Import translations. DO NOT MERGE" into pi-dev 2019-01-14 00:34:29 +00:00
Bill Yi
54b7ed4a9d Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I55aec88a6c77441c68c7121cab8dcce25d5ef4cc
2019-01-13 01:12:10 -08:00
Bill Yi
ab4f7ace74 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9baa804b18e008b1083ef970d9d3c12498364744
2019-01-13 01:08:13 -08:00
TreeHugger Robot
d9bca3f150 Merge "Import translations. DO NOT MERGE" 2019-01-12 06:15:26 +00:00
Bill Yi
b4ca13697f Import translations. DO NOT MERGE
Change-Id: I57c8de2acc020fdb8d30f8cdc6f5b616acc98eab
Auto-generated-cl: translation import
2019-01-11 14:14:06 -08:00
Bill Yi
b6b44c113b Import translations. DO NOT MERGE
Change-Id: I23b6acdfb44a25c8136764c6b1b254dd54e363a2
Auto-generated-cl: translation import
2019-01-11 14:13:56 -08:00
Anton Hansson
1c429e3a09 Move LatinIME and its lib to /product
This app is frequently overriden by proprietary apps
on shipping devices, so move it to /product along with
its jni library.

Bug: 122353713
Test: launch keyboard on aosp_arm64 emulator
Change-Id: Ied8c1e6133b67e28da76b0e48254e2e2e0ed15bf
2019-01-11 15:20:31 +00:00
TreeHugger Robot
2d2288f37c Merge "Import translations. DO NOT MERGE" into pi-dev 2018-12-28 22:05:37 +00:00
TreeHugger Robot
ba23f94b7b Merge "Import translations. DO NOT MERGE" into pi-dev 2018-12-28 20:17:46 +00:00
TreeHugger Robot
e921fbc7db Merge "Import translations. DO NOT MERGE" into pi-dev 2018-12-28 20:10:37 +00:00
Bill Yi
80e3014666 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id860302ad84eb62980b4a945874cb45edfdcc687
2018-12-28 10:44:42 -08:00
Bill Yi
3d3c1cd8bc Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6c89395f7bef7820235bd25d506493ab2bd577e5
2018-12-28 10:43:51 -08:00
Bill Yi
10af3a4c3c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1bb720f59308fd358bf855f68bec70fa4884f197
2018-12-28 10:42:05 -08:00
Bill Yi
ddfe606cca Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Iedbf75b9435c748ada110ea50847d4be9efe5f79
2018-12-28 10:40:03 -08:00
TreeHugger Robot
fd6a4b36d1 Merge "Import translations. DO NOT MERGE" 2018-12-11 21:17:52 +00:00
Bill Yi
8f8172dbae Import translations. DO NOT MERGE
Change-Id: Ife74efb16f80197258d9d56f26a5e8253fa9e503
Auto-generated-cl: translation import
2018-12-11 10:26:44 -08:00
Bill Yi
f40e90e607 Import translations. DO NOT MERGE
Change-Id: I390f4cc2cb95c7f814594b8ade8d41086e6772df
Auto-generated-cl: translation import
2018-12-11 10:26:31 -08:00
Bill Yi
633282d3f3 Import translations. DO NOT MERGE
Change-Id: I8f5a587e64d849d775f31e7f3383b2ea2f7c4146
Auto-generated-cl: translation import
2018-12-06 07:51:38 -08:00
Yohei Yukawa
b6ad3b8cbd Merge "Move MODULE_LICENSE_APACHE2 to the project top dir" am: a9cc446212 am: 91bb8ea67e
am: 55327c1a62

Change-Id: I35afb8777a41a3cfadb22e99b8e459b9ccd2520f
2018-11-19 23:33:36 -08:00
Yohei Yukawa
55327c1a62 Merge "Move MODULE_LICENSE_APACHE2 to the project top dir" am: a9cc446212
am: 91bb8ea67e

Change-Id: I1693b71dd6e5b9c3ad8b8d994545f77907903258
2018-11-19 23:13:53 -08:00
Yohei Yukawa
5b85311ab0 Move MODULE_LICENSE_APACHE2 to the project top dir
In general files in LatinIME project should be Apache 2 license
(unless some exceptional note is there).  This is not limited to Java
source files.

Hence moving MODULE_LICENSE_APACHE2 [1] to the project top directory
would make much more sense to avoid possible confusions.

NOTICE file is a bit complicated because it also needs to be copied
into the system image.  Since the actual build rule for LatinIME.apk
is placed as java/Android.bp, and
  notice: "../NOTICE"
is something that is not supported / recommended, this CL just copies
NOTICE file from java/NOTICE to the top level directory.

Note also that NOTICE for LatinIME has a special notation [2].

 [1]: Originally added in the following CL for Bug 2548782
      If50b2e9e9cc4b4876b0d047fc9f34e2d537a6da4
      443c360d0a
 [2]: Originally added in the following CL for Bug 7285172
      Ib4f4e433850d3f58e0a7cef205be4dc59c7f28c4
      49d301e9ad

Test: Locally verified as follows:
  lunch aosp_taimen-userdebug
  make -j
  cat $OUT/obj/NOTICE_FILES/src/system/app/LatinIME/LatinIME.apk.txt
Change-Id: I0ca84c46125de7f86f9e26906e107ac9ad7af177
2018-11-19 12:11:31 -08:00
Yohei Yukawa
04573e30ff Bump targetSdkVersion to "28" and minSdkVersion to "21"
With this CL, targetSdkVersion and minSdkVersion will be bumped as
follows:

  targetSdkVersion: 23 -> 28
     minSdkVersion: 14 -> 21

As far as we know, there should be no user-visible behavior change on
supported OS versions.

Fix: 119489995
Test: manually verified that LatinIME still is functional
Change-Id: I68f1545778b0c8b44c6850f22f3f5ca25bdb6de0
2018-11-13 13:51:59 -08:00
Yohei Yukawa
69ceec9045 Re-introduce <uses-sdk> to the main AndroidManifest.xml
This logically reverts my previous CL [1], which moved <uses-sdk />
from AndroidManifest.xml to AndroidManifest_SdkVersion.xml, which was
later accidentally removed during Android.bp migration [2].

Since gradle support in LatinIME is still experimental and not used in
official build, it is OK to keep it broken for a while.  A more
important problem right now is letting LatinIME target API 28.

As the first step to let LatinIME target SDK 28, <uses-sdk> will be
revived in AndroidManifest.xml

 [1]: Ib673bca5a31b2f95329c9310a127ec0701bd8fdc
      9cd42f39eb
 [2]: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
      22ebec6e2e

Bug: 110741422
Bug: 119489995
Test: manually verified that LatinIME still is functional
Change-Id: I8b04caa56fe2431c07e076fb6f97c560d5da8838
2018-11-13 13:49:23 -08:00
TreeHugger Robot
0b6f4bb0a6 Merge "Import translations. DO NOT MERGE" 2018-11-10 15:02:17 +00:00
TreeHugger Robot
f1f7f05512 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-11-10 14:44:20 +00:00
Bill Yi
9727374039 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If1a85bd7e787396faf8fb780a96e598c81dc4087
2018-11-10 00:11:52 -08:00
Bill Yi
af30ac8326 Import translations. DO NOT MERGE
Change-Id: Iec7f8162a5f1fa6323b5aaad028982d27ae4d703
Auto-generated-cl: translation import
2018-11-10 00:10:48 -08:00
Bill Yi
968f11511b Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6dd75f52e619fdc8c3d54ea223f0e35171b3bc1c
2018-11-09 23:52:56 -08:00
Bill Yi
517e77569e Import translations. DO NOT MERGE
Change-Id: I2cf19a83bd266325c4a1b37344bdab61753cdbca
Auto-generated-cl: translation import
2018-11-09 23:51:36 -08:00
Dan Willemsen
948cbbe986 Merge "Convert to Android.bp" am: 128f68acb2
am: 8e315deff9

Change-Id: I9d256889dbc4717293cff2b0ddd6e867ae54e47d
2018-11-08 17:03:45 -08:00
Bill Yi
2a04a34ee7 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I075d4469fed4c68a77c131c2f9d76ec283fe0b04
2018-11-06 05:31:13 -08:00
Bill Yi
13611e7a26 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I42759929af5c662c4b5d306b4967e67f5ad05547
2018-11-02 11:02:18 -07:00
Dan Willemsen
a23407bf62 Convert to Android.bp
See build/soong/README.md for more information.

Test: cd packages/inputmethods/LatinIME; mma
Change-Id: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
Merged-In: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
2018-11-01 23:09:33 +00:00
Dan Willemsen
22ebec6e2e Convert to Android.bp
See build/soong/README.md for more information.

Test: cd packages/inputmethods/LatinIME; mma
Change-Id: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
2018-10-31 21:49:02 -07:00
Tadashi G. Takaoka
b6301306fa Merge "Fix dicttool build" am: a92d0f9262 am: 438a303732
am: 6aed05232b

Change-Id: I558fb5ff22a7428d1d82eac82b4caba469ed48d4
2018-10-31 09:24:08 -07:00
Tadashi G. Takaoka
6aed05232b Merge "Fix dicttool build" am: a92d0f9262
am: 438a303732

Change-Id: If8b5ba833fa6872fcaeb43dbd7b0b0c9a5c65986
2018-10-31 09:18:51 -07:00
Tadashi G. Takaoka
6a1b37353d Fix dicttool build
This CL partially reverts
  - Id88b02b74bdfe4ca05b08181ceb6b34d5652fc0c
  - I05c7d8429e8d9a26139456763c77997340fea8c2
And followup (remove shortcut support)
  - I73b7dc008a5acaf75a31a36a2d332b5afabd82d0

Bug: 28255684
Test: make -j10 dicttool_aosp
Change-Id: I2e01ed86b9517a1141aee35ea6d8ef39258981d1
2018-10-29 15:59:05 +09:00
Bill Yi
9855237563 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I27785eae6f6e44e130a7cad0cfedeb8ed630e95f
2018-10-28 14:41:50 -07:00
Bill Yi
9c8608c642 Import translations. DO NOT MERGE
Change-Id: I60b4bb2939b9e6bb73072b3c2e96ca197c41f6f2
Auto-generated-cl: translation import
2018-10-25 06:24:18 -07:00
Bill Yi
67efbc844c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8f0f4691bcdb730d71feae0616c65f1e38b99b06
2018-10-15 09:48:59 -07:00
TreeHugger Robot
fe42418de4 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:56 +00:00
TreeHugger Robot
5958fb4cbc Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:54 +00:00
TreeHugger Robot
0ca0ed10c3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:35 +00:00
TreeHugger Robot
f1e3e4c5a8 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:46:38 +00:00
TreeHugger Robot
051ebe1f67 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:44:16 +00:00
Bill Yi
54e8416096 Import translations. DO NOT MERGE
Change-Id: Id26d6b48ca52c631b3f2041682663f07b49e4b80
Auto-generated-cl: translation import
2018-10-13 08:35:07 -07:00
Bill Yi
946631933a Import translations. DO NOT MERGE
Change-Id: I76dbccb4e65ebb99db55049222d6fe361d08d9fc
Auto-generated-cl: translation import
2018-10-13 08:34:10 -07:00
Bill Yi
b0fc52fca9 Import translations. DO NOT MERGE
Change-Id: I0606bc4b8d8c37ef386f1af4764a6887b86017f5
Auto-generated-cl: translation import
2018-10-13 08:32:35 -07:00
Bill Yi
4f8a5c0dd6 Import translations. DO NOT MERGE
Change-Id: Id8ca0f5d84e52df495611542f8c52e63329d531a
Auto-generated-cl: translation import
2018-10-13 08:31:41 -07:00
Bill Yi
819b30680c Import translations. DO NOT MERGE
Change-Id: I915ddb171c85d7f9f1428bb52e60727a9e254a60
Auto-generated-cl: translation import
2018-10-13 08:30:21 -07:00
Bill Yi
3725a3fbca Import translations. DO NOT MERGE
Change-Id: I521ffadf560fd919a12387844ba6799a024884b1
Auto-generated-cl: translation import
2018-10-13 08:28:46 -07:00
TreeHugger Robot
8353ab156f Merge "Import translations. DO NOT MERGE" into pi-dev 2018-09-29 21:29:24 +00:00
TreeHugger Robot
8f67a3867c Merge "Import translations. DO NOT MERGE" into pi-dev 2018-09-29 21:26:16 +00:00
Bill Yi
49192ae51d Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9784cfcb5280e415a04ad109c5ddee33997f7261
2018-09-28 21:46:47 -07:00
Bill Yi
dacc99b4c5 Import translations. DO NOT MERGE
Change-Id: I46a499dd1da79f06718cddfd3eafed8123a05967
Auto-generated-cl: translation import
2018-09-28 21:46:01 -07:00
Bill Yi
7eb444bd3f Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ib422a258a32e4a483c7e0713f3aadcaf8de7f512
2018-09-28 21:43:34 -07:00
Bill Yi
5cf980e6bc Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If0632d69913ac40f1723faa89272cece8b83f1a0
2018-09-28 21:33:11 -07:00
Bill Yi
47ce19e9dd Import translations. DO NOT MERGE
Change-Id: Ib23c52e3e48c46d621a99838f101982d17308d43
Auto-generated-cl: translation import
2018-09-26 20:54:53 -07:00
Bill Yi
0adefed05a Import translations. DO NOT MERGE
Change-Id: Ie1e3f7f1f5c270873cecd1b84cffbb2998a09423
Auto-generated-cl: translation import
2018-09-21 16:50:32 -07:00
Bill Yi
5acbc37fd4 Import translations. DO NOT MERGE
Change-Id: Ic2ea9113d32f5c0e0a13ab87b0dca6f71ea3dd78
Auto-generated-cl: translation import
2018-08-30 16:48:29 -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
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
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
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
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