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

Merge "Unsupport DebugActivity & EntryProvider in Settings."

Browse Source
This commit is contained in:
Zekan Qian
2022-10-13 09:11:59 +00:00
committed by Android (Google) Code Review
parent 77550eded2 430ed29262
commit 99b2bffe53
6 changed files with 15 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/spa/SettingsSpaEnvironment.kt
View File

@@ -36,7 +36,7 @@ import com.android.settingslib.spa.framework.common.SettingsPageProviderReposito
import com.android.settingslib.spa.framework.common.SpaEnvironment
import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListTemplate
object SettingsSpaEnvironment : SpaEnvironment() {
open class SettingsSpaEnvironment : SpaEnvironment() {
override val pageProviderRepository = lazy {
val togglePermissionAppListTemplate = TogglePermissionAppListTemplate(
allProviders = listOf(
@@ -65,8 +65,4 @@ object SettingsSpaEnvironment : SpaEnvironment() {
),
)
}
override val browseActivityClass = SpaActivity::class.java
override val entryProviderAuthorities = "com.android.settings.spa.provider"
}

2
src/com/android/settings/spa/SpaActivity.kt
View File

@@ -20,7 +20,7 @@ import android.content.Context
import android.content.Intent
import com.android.settingslib.spa.framework.BrowseActivity
class SpaActivity : BrowseActivity(SettingsSpaEnvironment) {
class SpaActivity : BrowseActivity() {
companion object {
@JvmStatic
fun startSpaActivity(context: Context, destination: String) {

21
src/com/android/settings/spa/SpaDebugActivity.kt
View File

@@ -1,21 +0,0 @@
/*
* 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 com.android.settingslib.spa.framework.DebugActivity
class SpaDebugActivity : DebugActivity(SettingsSpaEnvironment)

21
src/com/android/settings/spa/SpaEntryProvider.kt
View File

@@ -1,21 +0,0 @@
/*
* 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 com.android.settingslib.spa.framework.EntryProvider
class SpaEntryProvider : EntryProvider(SettingsSpaEnvironment)