diff --git a/aconfig/catalyst/network_and_internet.aconfig b/aconfig/catalyst/network_and_internet.aconfig index 130905f538a..e8943e66d84 100644 --- a/aconfig/catalyst/network_and_internet.aconfig +++ b/aconfig/catalyst/network_and_internet.aconfig @@ -35,3 +35,11 @@ flag { description: "Flag for Wi-Fi calling screen" bug: "323791114" } + +flag { + name: "catalyst_restrict_background_parent_entry" + namespace: "android_settings" + description: "Flag for Data Saver" + bug: "323791114" +} + diff --git a/src/com/android/settings/datausage/DataSaverScreen.kt b/src/com/android/settings/datausage/DataSaverScreen.kt new file mode 100644 index 00000000000..171f0025957 --- /dev/null +++ b/src/com/android/settings/datausage/DataSaverScreen.kt @@ -0,0 +1,50 @@ +/* + * 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.datausage + +import android.content.Context +import com.android.settings.R +import com.android.settings.flags.Flags +import com.android.settingslib.metadata.ProvidePreferenceScreen +import com.android.settingslib.metadata.preferenceHierarchy +import com.android.settingslib.preference.PreferenceScreenCreator + +@ProvidePreferenceScreen +class DataSaverScreen : PreferenceScreenCreator { + override val key + get() = KEY + + override val title + get() = R.string.data_saver_title + + override val icon: Int + get() = R.drawable.ic_settings_data_usage + + override fun order(context: Context) = 10 + + override fun isFlagEnabled(context: Context) = Flags.catalystRestrictBackgroundParentEntry() + + override fun fragmentClass() = DataSaverSummary::class.java + + override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {} + + override fun hasCompleteHierarchy() = false + + companion object { + const val KEY = "restrict_background_parent_entry" + } +} diff --git a/src/com/android/settings/datausage/DataSaverSummary.kt b/src/com/android/settings/datausage/DataSaverSummary.kt index e118bd67b8b..8db633331bc 100644 --- a/src/com/android/settings/datausage/DataSaverSummary.kt +++ b/src/com/android/settings/datausage/DataSaverSummary.kt @@ -79,6 +79,8 @@ class DataSaverSummary : DashboardFragment() { override fun getHelpResource() = R.string.help_url_data_saver override fun getLogTag() = TAG + override fun getPreferenceScreenBindingKey(context: Context) = DataSaverScreen.KEY + private val dataSaverBackendListener = object : DataSaverBackend.Listener { override fun onDataSaverChanged(isDataSaving: Boolean) { synchronized(this) { diff --git a/tests/robotests/src/com/android/settings/datausage/DataSaverScreenTest.kt b/tests/robotests/src/com/android/settings/datausage/DataSaverScreenTest.kt new file mode 100644 index 00000000000..08af4c0e862 --- /dev/null +++ b/tests/robotests/src/com/android/settings/datausage/DataSaverScreenTest.kt @@ -0,0 +1,35 @@ +/* + * 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.datausage + +import com.android.settings.flags.Flags +import com.android.settingslib.preference.CatalystScreenTestCase +import com.google.common.truth.Truth.assertThat +import org.junit.Test + +class DataSaverScreenTest : CatalystScreenTestCase() { + override val preferenceScreenCreator = DataSaverScreen() + override val flagName + get() = Flags.FLAG_CATALYST_RESTRICT_BACKGROUND_PARENT_ENTRY + + override fun migration() {} + + @Test + fun key() { + assertThat(preferenceScreenCreator.key).isEqualTo(DataSaverScreen.KEY) + } +}