Merge "Remove RUN_BACKUP_JOBS special app access page." into main
This commit is contained in:
@@ -31,7 +31,6 @@ import com.android.settings.spa.SpaActivity.Companion.startSpaActivity
|
||||
import com.android.settings.spa.SpaAppBridgeActivity.Companion.getDestinationForApp
|
||||
import com.android.settings.spa.app.specialaccess.AlarmsAndRemindersAppListProvider
|
||||
import com.android.settings.spa.app.specialaccess.AllFilesAccessAppListProvider
|
||||
import com.android.settings.spa.app.specialaccess.BackupTasksAppsListProvider
|
||||
import com.android.settings.spa.app.specialaccess.DisplayOverOtherAppsAppListProvider
|
||||
import com.android.settings.spa.app.specialaccess.InstallUnknownAppsListProvider
|
||||
import com.android.settings.spa.app.specialaccess.MediaManagementAppsAppListProvider
|
||||
@@ -66,8 +65,6 @@ object SettingsActivityUtil {
|
||||
WifiControlAppListProvider.getAppInfoRoutePrefix(),
|
||||
NfcTagAppsSettingsProvider::class.qualifiedName to
|
||||
NfcTagAppsSettingsProvider.getAppInfoRoutePrefix(),
|
||||
BackupTasksAppsListProvider::class.qualifiedName to
|
||||
BackupTasksAppsListProvider.getAppInfoRoutePrefix(),
|
||||
)
|
||||
|
||||
@JvmStatic
|
||||
|
||||
@@ -29,7 +29,6 @@ import com.android.settings.spa.app.backgroundinstall.BackgroundInstalledAppsPag
|
||||
import com.android.settings.spa.app.battery.BatteryOptimizationModeAppListPageProvider
|
||||
import com.android.settings.spa.app.specialaccess.AlarmsAndRemindersAppListProvider
|
||||
import com.android.settings.spa.app.specialaccess.AllFilesAccessAppListProvider
|
||||
import com.android.settings.spa.app.specialaccess.BackupTasksAppsListProvider
|
||||
import com.android.settings.spa.app.specialaccess.DisplayOverOtherAppsAppListProvider
|
||||
import com.android.settings.spa.app.specialaccess.InstallUnknownAppsListProvider
|
||||
import com.android.settings.spa.app.specialaccess.LongBackgroundTasksAppListProvider
|
||||
@@ -79,7 +78,6 @@ open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) {
|
||||
NfcTagAppsSettingsProvider,
|
||||
LongBackgroundTasksAppListProvider,
|
||||
TurnScreenOnAppsAppListProvider,
|
||||
BackupTasksAppsListProvider,
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,6 @@ import com.android.settings.flags.Flags
|
||||
import com.android.settings.spa.SpaActivity.Companion.startSpaActivity
|
||||
import com.android.settings.spa.app.appcompat.UserAspectRatioAppPreference
|
||||
import com.android.settings.spa.app.specialaccess.AlarmsAndRemindersAppListProvider
|
||||
import com.android.settings.spa.app.specialaccess.BackupTasksAppsListProvider
|
||||
import com.android.settings.spa.app.specialaccess.DisplayOverOtherAppsAppListProvider
|
||||
import com.android.settings.spa.app.specialaccess.InstallUnknownAppsListProvider
|
||||
import com.android.settings.spa.app.specialaccess.ModifySystemSettingsAppListProvider
|
||||
@@ -166,9 +165,6 @@ private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
|
||||
InstallUnknownAppsListProvider.InfoPageEntryItem(app)
|
||||
InteractAcrossProfilesDetailsPreference(app)
|
||||
AlarmsAndRemindersAppListProvider.InfoPageEntryItem(app)
|
||||
if (Flags.enablePerformBackupTasksInSettings()) {
|
||||
BackupTasksAppsListProvider.InfoPageEntryItem(app)
|
||||
}
|
||||
}
|
||||
|
||||
Category(title = stringResource(R.string.app_install_details_group_title)) {
|
||||
|
||||
@@ -1,54 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2024 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.app.specialaccess
|
||||
|
||||
import android.Manifest
|
||||
import android.app.AppOpsManager
|
||||
import android.app.settings.SettingsEnums
|
||||
import android.content.Context
|
||||
import com.android.settings.R
|
||||
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
|
||||
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
|
||||
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionRecord
|
||||
import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListProvider
|
||||
|
||||
object BackupTasksAppsListProvider : TogglePermissionAppListProvider {
|
||||
override val permissionType = "BackupTasksApps"
|
||||
override fun createModel(context: Context) = BackupTasksAppsListModel(context)
|
||||
}
|
||||
|
||||
class BackupTasksAppsListModel(context: Context) : AppOpPermissionListModel(context) {
|
||||
override val pageTitleResId = R.string.run_backup_tasks_title
|
||||
override val switchTitleResId = R.string.run_backup_tasks_switch_title
|
||||
override val footerResId = R.string.run_backup_tasks_footer_title
|
||||
override val appOp = AppOpsManager.OP_RUN_BACKUP_JOBS
|
||||
override val permission = Manifest.permission.RUN_BACKUP_JOBS
|
||||
override val setModeByUid = true
|
||||
|
||||
override fun setAllowed(record: AppOpPermissionRecord, newAllowed: Boolean) {
|
||||
super.setAllowed(record, newAllowed)
|
||||
logPermissionChange(newAllowed)
|
||||
}
|
||||
|
||||
private fun logPermissionChange(newAllowed: Boolean) {
|
||||
featureFactory.metricsFeatureProvider.action(
|
||||
context,
|
||||
SettingsEnums.ACTION_RUN_BACKUP_TASKS_TOGGLE,
|
||||
if (newAllowed) 1 else 0
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2024 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.app.specialaccess
|
||||
|
||||
import android.content.Context
|
||||
import androidx.preference.Preference
|
||||
import com.android.settings.core.BasePreferenceController
|
||||
import com.android.settings.spa.SpaActivity.Companion.startSpaActivity
|
||||
|
||||
class BackupTasksAppsPreferenceController(context: Context, preferenceKey: String) :
|
||||
BasePreferenceController(context, preferenceKey) {
|
||||
override fun getAvailabilityStatus() = CONDITIONALLY_UNAVAILABLE
|
||||
|
||||
override fun handlePreferenceTreeClick(preference: Preference): Boolean {
|
||||
if (preference.key == mPreferenceKey) {
|
||||
mContext.startSpaActivity(BackupTasksAppsListProvider.getAppListRoute())
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
}
|
||||
@@ -70,7 +70,6 @@ object SpecialAppAccessPageProvider : SettingsPageProvider {
|
||||
WifiControlAppListProvider,
|
||||
LongBackgroundTasksAppListProvider,
|
||||
TurnScreenOnAppsAppListProvider,
|
||||
BackupTasksAppsListProvider,
|
||||
)
|
||||
.map { it.buildAppListInjectEntry().setLink(fromPage = owner).build() }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user