Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15383b12 authored by Yuchen Sun's avatar Yuchen Sun Committed by Android (Google) Code Review
Browse files

Merge "Clean up slice from spa." into main

parents 89a8b437 fbf742fa

packages/SettingsLib/Spa/spa/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ android_library { 
    use_resource_processor: true,

    static_libs: [

        "SettingsLibColor",

        "androidx.slice_slice-builders",

        "androidx.slice_slice-core",

        "androidx.slice_slice-view",

        "androidx.compose.animation_animation",

        "androidx.compose.material3_material3",

        "androidx.compose.material_material-icons-extended",

packages/SettingsLib/Spa/spa/build.gradle.kts

+0 −3
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ android { 
dependencies {

    api(project(":SettingsLibColor"))

    api("androidx.appcompat:appcompat:1.7.0-rc01")

    api("androidx.slice:slice-builders:1.1.0-alpha02")

    api("androidx.slice:slice-core:1.1.0-alpha02")

    api("androidx.slice:slice-view:1.1.0-alpha02")

    api("androidx.compose.material3:material3:1.3.0-beta02")

    api("androidx.compose.material:material-icons-extended:$jetpackComposeVersion")

    api("androidx.compose.runtime:runtime-livedata:$jetpackComposeVersion")

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/SpaIntent.kt

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory 
const val SESSION_UNKNOWN = "unknown"

const val SESSION_BROWSE = "browse"

const val SESSION_SEARCH = "search"

const val SESSION_SLICE = "slice"

const val SESSION_EXTERNAL = "external"



const val KEY_DESTINATION = "spaActivityDestination"