From 499ffce2e704aa82b4d10468f99afd3dc4e727f8 Mon Sep 17 00:00:00 2001
From: Damian Patel <damianpatel@google.com>
Date: Wed, 28 Jul 2021 14:38:39 +0000
Subject: [PATCH] API level 30 upgrade: AOSP/Launcher3

The AndroidManifest.xml and build.gradle file of the AOSP
Launcher app has been upgraded so that its targetSdkVersion
is 30. This change has been made on git_master so that
we can avoid presubmit conflicts when making this change
on the aosp-master branch.

Change-Id: Ie476f8cbe56bf51218b15b8361a22fec2dc845e6
---
 AndroidManifest.xml | 2 +-
 build.gradle        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8066816e89..f793131fd3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,7 +20,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.launcher3">
-    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="26"/>
+    <uses-sdk android:targetSdkVersion="30" android:minSdkVersion="26"/>
     <!--
     Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
     Refer comments around specific entries on how to extend individual components.
diff --git a/build.gradle b/build.gradle
index a7eef13a3d..0622d87764 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,8 +21,8 @@ android {
     buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion 25
-        targetSdkVersion 28
+        minSdkVersion 26
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"