Merge "Update the isEnabled state of preferences in supervision features group... (bd03972f) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/supervision/SupervisionDashboardScreen.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ class SupervisionDashboardScreen : PreferenceScreenCreator {
		override fun getPreferenceHierarchy(context: Context) =
		preferenceHierarchy(context, this) {
		+SupervisionMainSwitchPreference()
		+TitlelessPreferenceGroup("supervision_features_group_1") += {
		+TitlelessPreferenceGroup(SUPERVISION_DYNAMIC_GROUP_1) += {
		// Empty category for dynamic injection targeting.
		}
		+SupervisionPinManagementScreen.KEY
		@@ -65,5 +65,6 @@ class SupervisionDashboardScreen : PreferenceScreenCreator {

		companion object {
		const val KEY = "top_level_supervision"
		internal const val SUPERVISION_DYNAMIC_GROUP_1 = "supervision_features_group_1"
		}
		}

src/com/android/settings/supervision/SupervisionMainSwitchPreference.kt

+49 −2

Original line number	Diff line number	Diff line
		@@ -17,17 +17,27 @@ package com.android.settings.supervision

		import android.app.supervision.SupervisionManager
		import android.content.Context
		import androidx.preference.Preference
		import com.android.settings.R
		import com.android.settingslib.datastore.KeyValueStore
		import com.android.settingslib.datastore.NoOpKeyedObservable
		import com.android.settingslib.metadata.MainSwitchPreference
		import com.android.settingslib.metadata.PreferenceLifecycleContext
		import com.android.settingslib.metadata.PreferenceLifecycleProvider
		import com.android.settingslib.metadata.PreferenceMetadata
		import com.android.settingslib.metadata.PreferenceSummaryProvider
		import com.android.settingslib.metadata.ReadWritePermit
		import com.android.settingslib.metadata.SensitivityLevel
		import com.android.settingslib.preference.MainSwitchPreferenceBinding
		import com.android.settingslib.preference.forEachRecursively

		/** Main toggle to enable or disable device supervision. */
		class SupervisionMainSwitchPreference :
		MainSwitchPreference(KEY, R.string.device_supervision_switch_title), PreferenceSummaryProvider {
		MainSwitchPreference(KEY, R.string.device_supervision_switch_title),
		PreferenceSummaryProvider,
		MainSwitchPreferenceBinding,
		Preference.OnPreferenceChangeListener,
		PreferenceLifecycleProvider {

		// TODO(b/383568136): Make presence of summary conditional on whether PIN
		// has been set up before or not.
		@@ -45,6 +55,43 @@ class SupervisionMainSwitchPreference :
		override val sensitivityLevel: Int
		get() = SensitivityLevel.HIGH_SENSITIVITY

		override fun bind(preference: Preference, metadata: PreferenceMetadata) {
		super.bind(preference, metadata)
		preference.onPreferenceChangeListener = this
		}

		override fun onResume(context: PreferenceLifecycleContext) {
		val currentValue = storage(context.applicationContext)?.getBoolean(key) ?: false

		updateDependentPreferencesEnabledState(
		context.findPreference<Preference>(KEY),
		currentValue,
		)
		}

		override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
		if (newValue !is Boolean) return true

		updateDependentPreferencesEnabledState(preference, newValue)

		return true
		}

		private fun updateDependentPreferencesEnabledState(
		preference: Preference?,
		isChecked: Boolean,
		) {
		preference?.parent?.forEachRecursively {
		if (
		it.parent?.key?.toString() ==
		SupervisionDashboardScreen.SUPERVISION_DYNAMIC_GROUP_1 \|\|
		it.key?.toString() == SupervisionPinManagementScreen.KEY
		) {
		it.isEnabled = isChecked
		}
		}
		}

		@Suppress("UNCHECKED_CAST")
		private class SupervisionMainSwitchStorage(private val context: Context) :
		NoOpKeyedObservable<String>(), KeyValueStore {
		@@ -59,7 +106,7 @@ class SupervisionMainSwitchPreference :
		// TODO(b/392694561): add PIN protection to main toggle.
		if (key == KEY && value is Boolean) {
		val supervisionManager = context.getSystemService(SupervisionManager::class.java)
		supervisionManager.setSupervisionEnabled(value)
		supervisionManager?.setSupervisionEnabled(value)
		}
		}
		}

tests/robotests/src/com/android/settings/supervision/SupervisionDashboardScreenTest.kt

+21 −0

Original line number	Diff line number	Diff line
		@@ -20,8 +20,11 @@ import android.content.Context
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.platform.test.flag.junit.SetFlagsRule
		import androidx.fragment.app.testing.FragmentScenario
		import androidx.preference.Preference
		import androidx.test.core.app.ApplicationProvider
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.android.settingslib.widget.MainSwitchPreference
		import com.google.common.truth.Truth.assertThat
		import org.junit.Rule
		import org.junit.Test
		@@ -51,4 +54,22 @@ class SupervisionDashboardScreenTest {
		fun flagDisabled() {
		assertThat(preferenceScreenCreator.isFlagEnabled(context)).isFalse()
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_SUPERVISION_SETTINGS_SCREEN)
		fun toggleMainSwitch_disablesChildPreferences() {
		FragmentScenario.launchInContainer(preferenceScreenCreator.fragmentClass()).onFragment {
		fragment ->
		val mainSwitchPreference =
		fragment.findPreference<MainSwitchPreference>(SupervisionMainSwitchPreference.KEY)!!
		val childPreference =
		fragment.findPreference<Preference>(SupervisionPinManagementScreen.KEY)!!

		assertThat(childPreference.isEnabled).isFalse()

		mainSwitchPreference.performClick()

		assertThat(childPreference.isEnabled).isTrue()
		}
		}
		}