Merge "Add SpaAppBridgeActivity for application usage"

src/com/android/settings/spa/SpaActivity.kt

@@ -18,16 +18,27 @@ package com.android.settings.spa
 
 import android.content.Context
 import android.content.Intent
+import android.os.UserHandle
 import com.android.settingslib.spa.framework.BrowseActivity
 import com.android.settingslib.spa.framework.util.appendSpaParams
 
 class SpaActivity : BrowseActivity() {
     companion object {
         @JvmStatic
-        fun startSpaActivity(context: Context, destination: String) {
-            val intent = Intent(context, SpaActivity::class.java)
+        fun Context.startSpaActivity(destination: String) {
+            val intent = Intent(this, SpaActivity::class.java)
                 .appendSpaParams(destination = destination)
-            context.startActivity(intent)
+            startActivity(intent)
+        }
+
+        @JvmStatic
+        fun Context.startSpaActivityForApp(destinationPrefix: String, intent: Intent): Boolean {
+            val packageName = intent.data?.schemeSpecificPart ?: return false
+            val userId = intent.getParcelableExtra(Intent.EXTRA_USER_HANDLE, UserHandle::class.java)
+                ?.identifier
+                ?: UserHandle.myUserId()
+            startSpaActivity("$destinationPrefix/$packageName/$userId")
+            return true
         }
     }
 }

src/com/android/settings/spa/SpaAppBridgeActivity.kt

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.spa
+
+import android.app.Activity
+import android.os.Bundle
+import com.android.settings.spa.SpaActivity.Companion.startSpaActivityForApp
+import com.android.settings.spa.SpaBridgeActivity.Companion.getDestination
+
+/**
+ * Activity used as a bridge to [SpaActivity] with package scheme for application usage.
+ *
+ * Since [SpaActivity] is not exported, [SpaActivity] could not be the target activity of
+ * <activity-alias>, otherwise all its pages will be exported.
+ * So need this bridge activity to sit in the middle of <activity-alias> and [SpaActivity].
+ */
+class SpaAppBridgeActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        getDestination()?.let { destination ->
+            startSpaActivityForApp(destination, intent)
+        }
+        finish()
+    }
+}

src/com/android/settings/spa/SpaBridgeActivity.kt

@@ -33,17 +33,17 @@ class SpaBridgeActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         getDestination()?.let { destination ->
-            startSpaActivity(this, destination)
+            startSpaActivity(destination)
         }
         finish()
     }
 
-    private fun getDestination(): String? =
-        packageManager.getActivityInfo(
-            componentName, ComponentInfoFlags.of(PackageManager.GET_META_DATA.toLong())
-        ).metaData.getString(META_DATA_KEY_DESTINATION)
-
     companion object {
+        fun Activity.getDestination(): String? =
+            packageManager.getActivityInfo(
+                componentName, ComponentInfoFlags.of(PackageManager.GET_META_DATA.toLong())
+            ).metaData.getString(META_DATA_KEY_DESTINATION)
+
         private const val META_DATA_KEY_DESTINATION = "com.android.settings.spa.DESTINATION"
     }
 }