commit 45d79db4d786dd74595bc49e33a31e0539fc53dd
author Fengjiang Li <fengjial@google.com> Mon Sep 23 16:00:34 2024 -0700
committer Fengjiang Li <fengjial@google.com> Mon Sep 23 16:11:28 2024 -0700
tree 25fbec6090b0bddac92b56e5df62deb606700b8a
parent e58dad0821e1de3d8cb8afe4f52fbb17459f31be

[Predictive Back] Enable predictive back in AndroidManifest.xml

Calling "getApplicationInfo().setEnableOnBackInvokedCallback(true)" is only suggested in tests.

Fix: 337985862
Flag: NONE - release feature fix
Test: manual
Change-Id: I336bdbe31c726b518d9342b1d39ef9e92f4dd498

quickstep/AndroidManifest.xml

diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index bf198b6..57bfb4a 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -54,6 +54,7 @@
         android:protectionLevel="signature|privileged" />
 
     <application android:backupAgent="com.android.launcher3.LauncherBackupAgent"
+         android:enableOnBackInvokedCallback="true"
          android:fullBackupOnly="true"
          android:fullBackupContent="@xml/backupscheme"
          android:hardwareAccelerated="true"

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 1f5cd3a..2ea88e9 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -681,10 +681,6 @@
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        // Back dispatcher is registered in {@link BaseActivity#onCreate}. For predictive back to
-        // work, we must opt-in BEFORE registering back dispatcher. So we need to call
-        // setEnableOnBackInvokedCallback() before super.onCreate()
-        getApplicationInfo().setEnableOnBackInvokedCallback(true);
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null) {
             mPendingSplitSelectInfo = ObjectWrapper.unwrap(