Revert unnecessary changes

go/AndroidManifest-launcher.xml

@@ -19,6 +19,7 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android">
+    <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.

go/AndroidManifest.xml

@@ -21,6 +21,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>
+
     <uses-permission android:name="android.permission.GET_TOP_ACTIVITY_INFO" />
 
     <application

lawnchair/AndroidManifest.xml

@@ -59,12 +59,10 @@
 
         <activity
             android:name="app.lawnchair.BlankActivity"
-            android:exported="false"
             android:theme="@style/Theme.Transparent" />
 
         <activity
             android:name="app.lawnchair.smartspace.SmartspacePreferencesShortcut"
-            android:exported="false"
             android:theme="@style/Theme.Transparent" />
 
         <activity android:name="androidx.slice.compat.SlicePermissionActivity"

lawnchair/src/app/lawnchair/LawnchairLauncher.kt

@@ -22,6 +22,8 @@ import android.view.ViewTreeObserver
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 import app.lawnchair.LawnchairApp.Companion.showQuickstepWarningIfNecessary
 import app.lawnchair.factory.LawnchairWidgetHolder
 import app.lawnchair.gestures.GestureController
@@ -39,6 +41,7 @@ import app.lawnchair.util.getThemedIconPacksInstalled
 import app.lawnchair.util.unsafeLazy
 import com.android.launcher3.BaseActivity
 import com.android.launcher3.LauncherAppState
+import com.android.launcher3.LauncherRootView
 import com.android.launcher3.LauncherState
 import com.android.launcher3.R
 import com.android.launcher3.allapps.ActivityAllAppsContainerView
@@ -151,6 +154,14 @@ class LawnchairLauncher : QuickstepLauncher() {
         reloadIconsIfNeeded()
     }
 
+    override fun setupViews() {
+        super.setupViews()
+        findViewById<LauncherRootView>(R.id.launcher).also {
+            it.setViewTreeLifecycleOwner(this)
+            it.setViewTreeSavedStateRegistryOwner(this)
+        }
+    }
+
     override fun collectStateHandlers(out: MutableList<StateManager.StateHandler<*>>) {
         super.collectStateHandlers(out)
         out.add(SearchBarStateHandler(this))
@@ -201,7 +212,7 @@ class LawnchairLauncher : QuickstepLauncher() {
         restartIfPending()
 
         dragLayer.viewTreeObserver.addOnDrawListener(object : ViewTreeObserver.OnDrawListener {
-            var handled = false
+            private var handled = false
 
             override fun onDraw() {
                 if (handled) {

quickstep/AndroidManifest.xml

@@ -62,7 +62,6 @@
 
         <activity android:name="com.android.quickstep.RecentsActivity"
              android:excludeFromRecents="true"
-             android:exported="true"
              android:launchMode="singleTask"
              android:clearTaskOnLaunch="true"
              android:stateNotNeeded="true"

tests/AndroidManifest.xml

@@ -18,6 +18,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.android.launcher3.tests">
 
+    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"
+        tools:overrideLibrary="android.support.test.uiautomator.v18"/>
+
     <application android:debuggable="true">
         <uses-library android:name="android.test.runner" />
     </application>

tests/dummy_app/AndroidManifest.xml

@@ -21,6 +21,7 @@
      to come from a domain that you own or have control over. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.aardwolf">
+    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="21"/>
     <application android:label="Aardwolf">
         <activity
             android:name="Activity1"