From 9538d9bf996b3f99129c702d02d9c47f7620c4f8 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 1 Apr 2021 13:14:23 -0400
Subject: [PATCH 1/9] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast
 PendingIntent.

Bug: 183927137
Test: restore phone and ensure broadcast is sent
Change-Id: I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2
(cherry picked from commit b62fba0d0199d719ac63761846e09b4b28e1dc2c)
---
 src/com/android/launcher3/model/FirstScreenBroadcast.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index 5112304fb8..f9ed2c78b6 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.model;
 
+import static android.app.PendingIntent.FLAG_IMMUTABLE;
+import static android.app.PendingIntent.FLAG_ONE_SHOT;
 import static android.os.Process.myUserHandle;
 
 import android.app.PendingIntent;
@@ -145,7 +147,7 @@ public class FirstScreenBroadcast {
                 .putStringArrayListExtra(HOTSEAT_ITEM_EXTRA, new ArrayList<>(hotseatItems))
                 .putStringArrayListExtra(WIDGET_ITEM_EXTRA, new ArrayList<>(widgetItems))
                 .putExtra(VERIFICATION_TOKEN_EXTRA, PendingIntent.getActivity(context, 0,
-                        new Intent(), PendingIntent.FLAG_ONE_SHOT)));
+                        new Intent(), FLAG_ONE_SHOT | FLAG_IMMUTABLE)));
     }
 
     private static String getPackageName(ItemInfo info) {

From d9389278cc9cc56fe2e66d771674008893c99135 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Mon, 12 Jul 2021 16:07:39 -0700
Subject: [PATCH 2/9] [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3

Added SPDX-license-identifier-Apache-2.0 to:
  Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I7114a8abc76d6aff0357e15e65b5a6d909f7cd35
Merged-in: I069f0fcd0652dcfd3e9c539e1f9bcb4c9225a10b
---
 Android.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Android.mk b/Android.mk
index 2c595505ff..aff12c5e5f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -91,6 +91,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml
 
 LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
 
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 include $(BUILD_PACKAGE)
 
 #
@@ -124,6 +127,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \
 
 LOCAL_MANIFEST_FILE := go/AndroidManifest.xml
 LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 include $(BUILD_PACKAGE)
 
 #
@@ -200,6 +206,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \
 LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
 LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
 
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 include $(BUILD_PACKAGE)
 
 
@@ -250,6 +259,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \
 
 LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
 LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 include $(BUILD_PACKAGE)
 
 

From 1c016851862141218ed2e9feb795a150e60ebe1c Mon Sep 17 00:00:00 2001
From: Damian Patel <damianpatel@google.com>
Date: Wed, 28 Jul 2021 14:38:39 +0000
Subject: [PATCH 3/9] 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
(cherry picked from commit 499ffce2e704aa82b4d10468f99afd3dc4e727f8)
---
 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"
 

From d0823a77daddae55dde14d72f798fd95cbb04ac6 Mon Sep 17 00:00:00 2001
From: Damian Patel <damianpatel@google.com>
Date: Mon, 26 Jul 2021 15:19:22 +0000
Subject: [PATCH 4/9] [DO NOT MERGE] API level 30 upgrade: AOSP/Launcher3

The AndroidManifest.xml file of the AOSP Launcher3 app
has been upgraded so that its targetSdkVersion is 30.

Test: manual - after the change, the app built, intialized,
and ran successfully with the UI features functioning
properly. One unit test failed although this same test failed
before the upgrade so this can be addressed later. It may be
an error with the test itself. CTS provider tests were also
run and the output can be seen below:

================= Results ==================
=============== Consumed Time ==============
    arm64-v8a CtsProviderTestCases: 18m 34s
Total aggregated tests run time: 18m 34s
============== TOP 1 Slow Modules ==============
    arm64-v8a CtsProviderTestCases: 0.34 tests/sec [376 tests / 1114253 msec]
============== Modules Preparation Times ==============
    arm64-v8a CtsProviderTestCases => prep = 9748 ms || clean = 3385 ms
Total preparation time: 9s  ||  Total tear down time: 3s
=======================================================
=============== Summary ===============
Total Run time: 20m 17s
1/1 modules completed
Total Tests       : 376
PASSED            : 362
FAILED            : 0
IGNORED           : 6
ASSUMPTION_FAILURE: 8
============== End of Results ==============

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b031ffbee4..0355ac1b9b 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="25"/>
+    <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 534ca65115..9cbd9b9d25 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ android {
 
     defaultConfig {
         minSdkVersion 25
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 

From 4eda9fc8482914a03df6b6c7479d00524fb3d82d Mon Sep 17 00:00:00 2001
From: Robb Glasser <rglasser@google.com>
Date: Thu, 5 Aug 2021 21:03:31 +0000
Subject: [PATCH 5/9] Revert "[DO NOT MERGE]"

This reverts commit d0823a77daddae55dde14d72f798fd95cbb04ac6.

Reason for revert: Broke the build: b/195683319

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0355ac1b9b..b031ffbee4 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="30" android:minSdkVersion="26"/>
+    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>
     <!--
     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 9cbd9b9d25..534ca65115 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ android {
 
     defaultConfig {
         minSdkVersion 25
-        targetSdkVersion 30
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 

From 3f6a4e6bf5c1618583770a88a16a0647df8a27d2 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Mon, 9 Aug 2021 17:45:22 -0700
Subject: [PATCH 6/9] Adjust all apps zoom level

The All Apps scrim fades in early, covering part of the zoom animation.
We need to adjust the max zoom in order to make All Apps consistent with
Overview, -1, and Shade.

Test: pull up the all apps drawer
Fixes: 195992422
Change-Id: Ia7bbe17fe7f227dd0a16ba7d21b402cff57176f0
(cherry picked from commit f168bb7aaf94dc3e7c483278ee6eb671485c38c1)
---
 .../android/launcher3/uioverrides/states/AllAppsState.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index d822c8cf82..f8c9fd128f 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -70,7 +70,9 @@ public class AllAppsState extends LauncherState {
 
     @Override
     protected float getDepthUnchecked(Context context) {
-        return 1f;
+        // The scrim fades in at approximately 50% of the swipe gesture.
+        // This means that the depth should be greater than 1, in order to fully zoom out.
+        return 2f;
     }
 
     @Override

From bdffb53843235563a2c40a3f503234cb1c767a62 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 11 Aug 2021 22:40:06 +0100
Subject: [PATCH 7/9] Fix pending restore widget touch issue

After http://ag/14980850, we block updateAppWidget until app widget
is restored. However, PendingAppWidgetHostView constructor relies
on updateAppWidget(null) to trigger set listener in getDefaultView().
We should call super.updateAppWidget(null) in the constructor instead.

Test: manual
Bug: 14980850
Change-Id: I30af9778a636af2ad822e7abc152b6f0bfdea1bf
---
 src/com/android/launcher3/widget/PendingAppWidgetHostView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
index d3a019001d..57a6d3fb07 100644
--- a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
@@ -85,7 +85,7 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
         setBackgroundResource(R.drawable.pending_widget_bg);
         setWillNotDraw(false);
 
-        updateAppWidget(null);
+        super.updateAppWidget(null);
         setOnClickListener(ItemClickHandler.INSTANCE);
 
         if (info.pendingItemInfo == null) {

From 94b8f0f6e446bab6876d0827fa7c275c7337770f Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 25 Aug 2021 22:06:47 +0000
Subject: [PATCH 8/9] Disable eager initialization of Jetpack libraries

Bug: 197780098
Test: Launcher3 tests
Change-Id: I8f921ae26e873822ac2340ad78449cf1040af4cf
Merged-In: I8f921ae26e873822ac2340ad78449cf1040af4cf
(cherry picked from commit a88802ee922bec27ef7ce3a45471fc163afbb7a7)
---
 AndroidManifest-common.xml       | 7 +++++++
 tests/AndroidManifest-common.xml | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index d725a16f80..3b6141b47f 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -19,6 +19,7 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.android.launcher3">
 
     <!--
@@ -176,5 +177,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+
+        <!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
     </application>
 </manifest>
diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml
index 918ec4af1a..4d980c47e0 100644
--- a/tests/AndroidManifest-common.xml
+++ b/tests/AndroidManifest-common.xml
@@ -16,6 +16,7 @@
 
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.android.launcher3.tests">
 
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
@@ -235,5 +236,11 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity-alias>
+
+        <!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
     </application>
 </manifest>

From 183bca2dcce50780f8d434e99558fac1bcf2af28 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Thu, 26 Aug 2021 03:27:13 +0000
Subject: [PATCH 9/9] Temporarily disable Launcher3 tests affected by fling
 changes

Bug: 197802324
Test: TaplTestsLauncher3
Change-Id: I3958bd9fb5521d09fa7cae642128b9f5e11b8e2e
Merged-In: I3958bd9fb5521d09fa7cae642128b9f5e11b8e2e
(cherry picked from commit bc4dc49c6c48bc716df63def3b25c476a414a757)
---
 .../tests/src/com/android/quickstep/TaplTestsQuickstep.java     | 2 ++
 tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index a5038a1fb0..b856e0b560 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -44,6 +44,7 @@ import com.android.quickstep.views.RecentsView;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -218,6 +219,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
     }
 
     @Test
+    @Ignore("b/197802324")
     @PortraitLandscape
     public void testAllAppsFromHome() throws Exception {
         // Test opening all apps
diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index 4dd44f4193..d8576df947 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -247,6 +247,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
     }
 
     @Test
+    @Ignore("b/197802324")
     @PortraitLandscape
     public void testWidgets() throws Exception {
         // Test opening widgets.