Merge changes from topic "catalyst-DataSaver" into main (8fab3bf0) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsActivity.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -311,6 +311,11 @@ public class SettingsActivity extends SettingsBaseActivity
		}

		setContentView(R.layout.settings_main_prefs);
		mMainSwitch = findViewById(R.id.switch_bar);
		if (mMainSwitch != null) {
		mMainSwitch.setMetricsCategory(lookupMetricsCategory());
		mMainSwitch.setTranslationZ(findViewById(R.id.main_content).getTranslationZ() + 1);
		}

		getSupportFragmentManager().addOnBackStackChangedListener(this);

		@@ -330,12 +335,6 @@ public class SettingsActivity extends SettingsBaseActivity
		launchSettingFragment(initialFragmentName, intent);
		}

		mMainSwitch = findViewById(R.id.switch_bar);
		if (mMainSwitch != null) {
		mMainSwitch.setMetricsCategory(lookupMetricsCategory());
		mMainSwitch.setTranslationZ(findViewById(R.id.main_content).getTranslationZ() + 1);
		}

		// see if we should show Back/Next buttons
		if (intent.getBooleanExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false)) {

src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		/*
		* 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.widget.MainSwitchBarMetadata
		import com.android.settingslib.datastore.KeyValueStore
		import com.android.settingslib.datastore.NoOpKeyedObservable
		import com.android.settingslib.metadata.PreferenceLifecycleContext
		import com.android.settingslib.metadata.PreferenceLifecycleProvider
		import com.android.settingslib.metadata.ReadWritePermit

		class DataSaverMainSwitchPreference(context: Context) :
		MainSwitchBarMetadata, PreferenceLifecycleProvider {

		private val dataSaverBackend = DataSaverBackend(context)
		private var dataSaverBackendListener: DataSaverBackend.Listener? = null

		override val key
		get() = "use_data_saver"

		override val title
		get() = R.string.data_saver_switch_title

		override fun storage(context: Context): KeyValueStore = DataSaverStore(dataSaverBackend)

		override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
		ReadWritePermit.ALLOW

		override fun onStart(context: PreferenceLifecycleContext) {
		val listener = DataSaverBackend.Listener { context.notifyPreferenceChange(this) }
		dataSaverBackendListener = listener
		dataSaverBackend.addListener(listener)
		}

		override fun onStop(context: PreferenceLifecycleContext) {
		dataSaverBackendListener?.let {
		dataSaverBackend.remListener(it)
		dataSaverBackendListener = null
		}
		}

		@Suppress("UNCHECKED_CAST")
		private class DataSaverStore(private val dataSaverBackend: DataSaverBackend) :
		NoOpKeyedObservable<String>(), KeyValueStore {

		override fun contains(key: String) = true // just assume the datastore contains the value

		override fun <T : Any> getValue(key: String, valueType: Class<T>): T? =
		dataSaverBackend.isDataSaverEnabled as T?

		override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
		dataSaverBackend.isDataSaverEnabled = value as Boolean
		}
		}
		}

src/com/android/settings/datausage/DataSaverScreen.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,8 @@ class DataSaverScreen : PreferenceScreenCreator {

		override fun fragmentClass() = DataSaverSummary::class.java

		override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
		override fun getPreferenceHierarchy(context: Context) =
		preferenceHierarchy(this) { +DataSaverMainSwitchPreference(context) }

		override fun hasCompleteHierarchy() = false

src/com/android/settings/datausage/DataSaverSummary.kt

+15 −7

Original line number	Diff line number	Diff line
		@@ -43,27 +43,35 @@ class DataSaverSummary : DashboardFragment() {
		return
		}

		if (!isCatalystEnabled) {
		dataSaverBackend = DataSaverBackend(requireContext())
		}
		}

		override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
		super.onViewCreated(view, savedInstanceState)
		if (!isCatalystEnabled) {
		switchBar = (activity as SettingsActivity).switchBar.apply {
		setTitle(getString(R.string.data_saver_switch_title))
		show()
		addOnSwitchChangeListener { _, isChecked -> onSwitchChanged(isChecked) }
		}
		}
		}

		override fun onResume() {
		super.onResume()
		if (!isCatalystEnabled) {
		dataSaverBackend.addListener(dataSaverBackendListener)
		}
		}

		override fun onPause() {
		super.onPause()
		if (!isCatalystEnabled) {
		dataSaverBackend.remListener(dataSaverBackendListener)
		}
		}

		private fun onSwitchChanged(isChecked: Boolean) {
		synchronized(this) {

src/com/android/settings/widget/MainSwitchBarMetadata.kt

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		/*
		* 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.widget

		import android.content.Context
		import androidx.preference.Preference
		import com.android.settingslib.metadata.PreferenceMetadata
		import com.android.settingslib.metadata.TwoStatePreference
		import com.android.settingslib.preference.PreferenceBindingPlaceholder
		import com.android.settingslib.preference.TwoStatePreferenceBinding

		/** Base metadata of `MainSwitchBar`. */
		interface MainSwitchBarMetadata :
		TwoStatePreference, TwoStatePreferenceBinding, PreferenceBindingPlaceholder {

		override fun createWidget(context: Context) = MainSwitchBarPreference(context, this)

		override fun bind(preference: Preference, metadata: PreferenceMetadata) {
		super.bind(preference, metadata)
		(preference as MainSwitchBarPreference).updateVisibility()
		}
		}