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

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

Merge "Clean up slice from spa and move androidx.slice dependency to Settings." into main

parents 770917dc 93036e20

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ android_library { 
    static_libs: [

        // External dependencies

        "androidx.navigation_navigation-fragment-ktx",

        "androidx.slice_slice-builders",

        "androidx.slice_slice-core",

        "androidx.slice_slice-view",

        "androidx.window_window-java",

        "gson",

        "guava",

src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt

+0 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import com.android.settingslib.spa.framework.common.SpaLogger 
import com.android.settingslib.spa.framework.util.SESSION_BROWSE

import com.android.settingslib.spa.framework.util.SESSION_EXTERNAL

import com.android.settingslib.spa.framework.util.SESSION_SEARCH

import com.android.settingslib.spa.framework.util.SESSION_SLICE

import com.android.settingslib.spa.framework.util.SESSION_UNKNOWN



/**
@@ -74,7 +73,6 @@ class SpaLogData(val id: String, val event: LogEvent, 
        return when(sessionSource) {

            SESSION_BROWSE -> SettingsEnums.SESSION_BROWSE

            SESSION_SEARCH -> SettingsEnums.SESSION_SEARCH

            SESSION_SLICE -> SettingsEnums.SESSION_SLICE_TYPE

            SESSION_EXTERNAL -> SettingsEnums.SESSION_EXTERNAL

            else -> SettingsEnums.SESSION_UNKNOWN

        }