From 69ceec90456e094a65e80553b9e11b573c04ef1c Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Tue, 13 Nov 2018 13:49:23 -0800
Subject: [PATCH] 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
      9cd42f39eb31d4f0b9cb3a795025e8ab3663f3c8
 [2]: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
      22ebec6e2e4bdf3f18023907e649c68ab8b3c7a3

Bug: 110741422
Bug: 119489995
Test: manually verified that LatinIME still is functional
Change-Id: I8b04caa56fe2431c07e076fb6f97c560d5da8838
---
 java/AndroidManifest.xml  | 2 ++
 tests/AndroidManifest.xml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 5127c10e6..2d0dc4afb 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -19,6 +19,8 @@
         package="com.android.inputmethod.latin"
         android:versionCode="28">
 
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index cf778c187..aa75ffbd6 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -18,6 +18,8 @@
     package="com.android.inputmethod.latin.tests"
     android:versionCode="28">
 
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
+
     <uses-permission android:name="android.permission.READ_CONTACTS" />
 
     <application android:label="@string/app_name"