Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Export SpaDestination.startFromExportedActivity" into main

Browse Source
This commit is contained in:
Chaohui Wang
2024-06-27 14:09:42 +00:00
committed by Android (Google) Code Review
parent 94cfea7ed1 7ef8b0c518
commit 03e9188830
4 changed files with 149 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/com/android/settings/spa/SpaBridgeActivity.kt
View File

@@ -17,20 +17,18 @@
package com.android.settings.spa
import android.app.Activity
import android.content.Intent
import android.content.pm.PackageManager.ComponentInfoFlags
import android.content.pm.PackageManager.GET_META_DATA
import android.os.Bundle
import com.android.settings.activityembedding.ActivityEmbeddingUtils
import com.android.settings.activityembedding.EmbeddedDeepLinkUtils.tryStartMultiPaneDeepLink
import com.android.settings.spa.SpaDestination.Companion.getDestination
import com.android.settingslib.spa.framework.util.SESSION_EXTERNAL
import com.android.settingslib.spa.framework.util.appendSpaParams
import androidx.annotation.VisibleForTesting
import com.android.settings.SettingsActivity.META_DATA_KEY_HIGHLIGHT_MENU_KEY
/**
* Activity used as a bridge to [SpaActivity].
*
* 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].
* <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 SpaBridgeActivity : Activity() {
override fun onCreate(savedInstanceState: Bundle?) {
@@ -41,17 +39,28 @@ class SpaBridgeActivity : Activity() {
companion object {
fun Activity.startSpaActivityFromBridge(destinationFactory: (String) -> String? = { it }) {
val (destination, highlightMenuKey) = getDestination(destinationFactory) ?: return
val intent = Intent(this, SpaActivity::class.java)
.appendSpaParams(
destination = destination,
sessionName = SESSION_EXTERNAL,
)
if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this) ||
!tryStartMultiPaneDeepLink(intent, highlightMenuKey)
) {
startActivity(intent)
}
getDestination(destinationFactory)?.startFromExportedActivity(this)
}
@VisibleForTesting
fun Activity.getDestination(
destinationFactory: (String) -> String? = { it },
): SpaDestination? {
val metaData =
packageManager
.getActivityInfo(componentName, ComponentInfoFlags.of(GET_META_DATA.toLong()))
.metaData
val destination = metaData.getString(META_DATA_KEY_DESTINATION)
if (destination.isNullOrBlank()) return null
val finalDestination = destinationFactory(destination)
if (finalDestination.isNullOrBlank()) return null
return SpaDestination(
destination = finalDestination,
highlightMenuKey = metaData.getString(META_DATA_KEY_HIGHLIGHT_MENU_KEY),
)
}
@VisibleForTesting
const val META_DATA_KEY_DESTINATION = "com.android.settings.spa.DESTINATION"
}
}

35
src/com/android/settings/spa/SpaDestination.kt
View File

@@ -17,33 +17,26 @@
package com.android.settings.spa
import android.app.Activity
import android.content.pm.PackageManager
import androidx.annotation.VisibleForTesting
import com.android.settings.SettingsActivity.META_DATA_KEY_HIGHLIGHT_MENU_KEY
import android.content.Intent
import com.android.settings.activityembedding.ActivityEmbeddingUtils
import com.android.settings.activityembedding.EmbeddedDeepLinkUtils.tryStartMultiPaneDeepLink
import com.android.settingslib.spa.framework.util.SESSION_EXTERNAL
import com.android.settingslib.spa.framework.util.appendSpaParams
data class SpaDestination(
val destination: String,
val highlightMenuKey: String?,
) {
companion object {
fun Activity.getDestination(
destinationFactory: (String) -> String? = { it },
): SpaDestination? {
val metaData = packageManager.getActivityInfo(
componentName,
PackageManager.ComponentInfoFlags.of(PackageManager.GET_META_DATA.toLong())
).metaData
val destination = metaData.getString(META_DATA_KEY_DESTINATION)
if (destination.isNullOrBlank()) return null
val finalDestination = destinationFactory(destination)
if (finalDestination.isNullOrBlank()) return null
return SpaDestination(
destination = finalDestination,
highlightMenuKey = metaData.getString(META_DATA_KEY_HIGHLIGHT_MENU_KEY),
fun startFromExportedActivity(activity: Activity) {
val intent = Intent(activity, SpaActivity::class.java)
.appendSpaParams(
destination = destination,
sessionName = SESSION_EXTERNAL,
)
if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(activity) ||
!activity.tryStartMultiPaneDeepLink(intent, highlightMenuKey)
) {
activity.startActivity(intent)
}
@VisibleForTesting
const val META_DATA_KEY_DESTINATION = "com.android.settings.spa.DESTINATION"
}
}