PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yuchen Sun
2024-07-18 08:26:05 +00:00
committed by Android (Google) Code Review
parent 770917dc6b 93036e2045
commit 028dd20d96
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.bp
View File

@@ -68,6 +68,9 @@ android_library {
static_libs: [ static_libs: [
// External dependencies // External dependencies
"androidx.navigation_navigation-fragment-ktx", "androidx.navigation_navigation-fragment-ktx",
"androidx.slice_slice-builders",
"androidx.slice_slice-core",
"androidx.slice_slice-view",
"androidx.window_window-java", "androidx.window_window-java",
"gson", "gson",
"guava", "guava",

2
src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt
View File

@@ -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_BROWSE
import com.android.settingslib.spa.framework.util.SESSION_EXTERNAL 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_SEARCH
import com.android.settingslib.spa.framework.util.SESSION_SLICE
import com.android.settingslib.spa.framework.util.SESSION_UNKNOWN import com.android.settingslib.spa.framework.util.SESSION_UNKNOWN
/** /**
@@ -74,7 +73,6 @@ class SpaLogData(val id: String, val event: LogEvent,
return when(sessionSource) { return when(sessionSource) {
SESSION_BROWSE -> SettingsEnums.SESSION_BROWSE SESSION_BROWSE -> SettingsEnums.SESSION_BROWSE
SESSION_SEARCH -> SettingsEnums.SESSION_SEARCH SESSION_SEARCH -> SettingsEnums.SESSION_SEARCH
SESSION_SLICE -> SettingsEnums.SESSION_SLICE_TYPE
SESSION_EXTERNAL -> SettingsEnums.SESSION_EXTERNAL SESSION_EXTERNAL -> SettingsEnums.SESSION_EXTERNAL
else -> SettingsEnums.SESSION_UNKNOWN else -> SettingsEnums.SESSION_UNKNOWN
} }