Merge "Create add supervision recovery preference in Pin management dashboard" into main (506c119d) · Commits · e / os / android_packages_apps_Settings

res/drawable/exclamation_icon.xml

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		<!--
		~ Copyright (C) 2025 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
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:autoMirrored="true"
		android:height="20dp"
		android:viewportHeight="20"
		android:viewportWidth="20"
		android:width="20dp">

		<path
		android:fillColor="#FFE07C"
		android:pathData="M8.804,0.296C9.554,-0.099 10.446,-0.099 11.196,0.296L12.45,0.955C12.703,1.088 12.976,1.178 13.257,1.221L14.654,1.436C15.489,1.564 16.211,2.096 16.589,2.862L17.223,4.144C17.349,4.402 17.518,4.637 17.721,4.84L18.726,5.847C19.328,6.449 19.603,7.31 19.465,8.155L19.236,9.57C19.189,9.855 19.189,10.145 19.236,10.43L19.465,11.845C19.603,12.69 19.328,13.55 18.726,14.153L17.721,15.16C17.518,15.363 17.349,15.597 17.223,15.856L16.589,17.137C16.211,17.903 15.489,18.435 14.654,18.564L13.257,18.78C12.976,18.822 12.703,18.913 12.45,19.045L11.196,19.704C10.446,20.099 9.554,20.099 8.804,19.704L7.549,19.045C7.297,18.913 7.024,18.822 6.743,18.78L5.346,18.564C4.511,18.435 3.789,17.903 3.411,17.137L2.777,15.856C2.651,15.597 2.482,15.363 2.279,15.16L1.274,14.153C0.672,13.55 0.397,12.69 0.535,11.845L0.764,10.43C0.811,10.145 0.811,9.855 0.764,9.57L0.535,8.155C0.397,7.31 0.672,6.449 1.274,5.847L2.279,4.84C2.482,4.637 2.651,4.402 2.777,4.144L3.411,2.862C3.789,2.096 4.511,1.564 5.346,1.436L6.743,1.221C7.024,1.178 7.297,1.088 7.549,0.955L8.804,0.296Z" />

		<group>

		<clip-path android:pathData="M1,1h18v18h-18z" />

		<path
		android:fillColor="#4D2600"
		android:pathData="M8.894,12.081V4.919H11.106V12.081H8.894ZM8.894,15.081V12.869H11.106V15.081H8.894Z" />

		</group>

		</vector>

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -14450,6 +14450,8 @@ Data usage charges may apply.</string>
		<string name="supervision_delete_pin_preference_title">Delete PIN</string>
		<!-- Summary for supervision delete pin setting entry [CHAR LIMIT=NONE] -->
		<string name="supervision_delete_pin_preference_summary">This will reset all your supervision settings</string>
		<!-- Title for adding supervision PIN recovery setting entry [CHAR LIMIT=NONE] -->
		<string name="supervision_add_pin_recovery_title">Tap to add recovery</string>
		<!-- Title for web content filters entry [CHAR LIMIT=60] -->
		<string name="supervision_web_content_filters_title">Web content filters</string>
		<!-- Title for web content filters browser category [CHAR LIMIT=60] -->

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

0 → 100644

+101 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 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.supervision

		import android.annotation.DrawableRes
		import android.app.Activity
		import android.app.supervision.SupervisionManager
		import android.app.supervision.flags.Flags
		import android.content.Context
		import android.content.Intent
		import androidx.preference.Preference
		import com.android.settings.R
		import com.android.settingslib.metadata.PreferenceAvailabilityProvider
		import com.android.settingslib.metadata.PreferenceLifecycleContext
		import com.android.settingslib.metadata.PreferenceLifecycleProvider
		import com.android.settingslib.metadata.PreferenceMetadata
		import com.android.settingslib.preference.PreferenceBinding

		/**
		* Setting on PIN Management screen (Settings > Supervision > Manage Pin) that invokes the flow to
		* add the device PIN recovery method.
		*/
		class SupervisionAddRecoveryPreference :
		PreferenceMetadata,
		PreferenceAvailabilityProvider,
		PreferenceLifecycleProvider,
		PreferenceBinding,
		Preference.OnPreferenceClickListener {

		private lateinit var lifeCycleContext: PreferenceLifecycleContext
		override val key: String
		get() = KEY

		override val title: Int
		get() = R.string.supervision_add_pin_recovery_title

		// TODO(b/409837094): get icon with dynamic color.
		override val icon: Int
		@DrawableRes get() = R.drawable.exclamation_icon

		override fun isAvailable(context: Context): Boolean {
		if (!Flags.enableSupervisionPinRecoveryScreen()) {
		return false
		}
		return context
		.getSystemService(SupervisionManager::class.java)
		?.getSupervisionRecoveryInfo()
		?.let { it.email.isNullOrEmpty() && it.id.isNullOrEmpty() } ?: true
		}

		override fun onCreate(context: PreferenceLifecycleContext) {
		lifeCycleContext = context
		}

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

		override fun onActivityResult(
		context: PreferenceLifecycleContext,
		requestCode: Int,
		resultCode: Int,
		data: Intent?,
		): Boolean {
		if (requestCode != ADD_RECOVERY_REQUEST_CODE) {
		return false
		}
		if (resultCode == Activity.RESULT_OK) {
		context.notifyPreferenceChange(KEY)
		context.notifyPreferenceChange(SupervisionUpdateRecoveryEmailPreference.KEY)
		}
		return true
		}

		override fun onPreferenceClick(preference: Preference): Boolean {
		val intent =
		Intent(lifeCycleContext, SupervisionPinRecoveryActivity::class.java)
		.setAction(SupervisionPinRecoveryActivity.ACTION_SETUP_VERIFIED)
		lifeCycleContext.startActivityForResult(intent, ADD_RECOVERY_REQUEST_CODE, null)
		return true
		}

		companion object {
		const val KEY = "supervision_add_recovery"
		const val ADD_RECOVERY_REQUEST_CODE = 1
		}
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ class SupervisionPinManagementScreen : PreferenceScreenCreator, PreferenceAvaila

		override fun getPreferenceHierarchy(context: Context) =
		preferenceHierarchy(context, this) {
		+SupervisionAddRecoveryPreference()
		+TitlelessPreferenceGroup(GROUP_KEY) += {
		+SupervisionPinRecoveryPreference()
		// TODO(b/391992481) implement the screen.

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

0 → 100644

+136 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 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.supervision

		import android.app.supervision.SupervisionManager
		import android.app.supervision.SupervisionRecoveryInfo
		import android.app.supervision.flags.Flags
		import android.content.Context
		import android.content.ContextWrapper
		import android.content.Intent
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.platform.test.flag.junit.SetFlagsRule
		import androidx.preference.Preference
		import androidx.test.core.app.ApplicationProvider
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.android.settings.R
		import com.android.settingslib.metadata.PreferenceLifecycleContext
		import com.android.settingslib.preference.createAndBindWidget
		import com.google.common.truth.Truth.assertThat
		import org.junit.Before
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.kotlin.argumentCaptor
		import org.mockito.kotlin.doReturn
		import org.mockito.kotlin.eq
		import org.mockito.kotlin.mock
		import org.mockito.kotlin.stub
		import org.mockito.kotlin.verify
		import org.mockito.kotlin.whenever

		@RunWith(AndroidJUnit4::class)
		class SupervisionAddRecoveryPreferenceTest {

		private val appContext: Context = ApplicationProvider.getApplicationContext()
		private val mockLifeCycleContext = mock<PreferenceLifecycleContext>()
		private val mockSupervisionManager = mock<SupervisionManager>()

		@get:Rule val setFlagsRule = SetFlagsRule()
		private var preference = SupervisionAddRecoveryPreference()
		private val context =
		object : ContextWrapper(appContext) {
		override fun getSystemService(name: String): Any =
		when (name) {
		Context.SUPERVISION_SERVICE -> mockSupervisionManager
		else -> super.getSystemService(name)
		}
		}

		@Before
		fun setUp() {
		preference.onCreate(mockLifeCycleContext)
		}

		@Test
		fun getTitle() {
		assertThat(preference.title).isEqualTo(R.string.supervision_add_pin_recovery_title)
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_SUPERVISION_PIN_RECOVERY_SCREEN)
		fun flagEnabled_recoveryNotExist_isAvailable() {
		whenever(mockSupervisionManager.supervisionRecoveryInfo).thenReturn(null)

		assertThat(preference.isAvailable(context)).isTrue()
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_SUPERVISION_PIN_RECOVERY_SCREEN)
		fun flagEnabled_recoveryInfoEmpty_isAvailable() {
		whenever(mockSupervisionManager.supervisionRecoveryInfo)
		.thenReturn(SupervisionRecoveryInfo())

		assertThat(preference.isAvailable(context)).isTrue()
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_SUPERVISION_PIN_RECOVERY_SCREEN)
		fun flagEnabled_recoveryExist_notAvailable() {
		val recoveryInfo = SupervisionRecoveryInfo().apply { email = "email" }
		whenever(mockSupervisionManager.supervisionRecoveryInfo).thenReturn(recoveryInfo)

		assertThat(preference.isAvailable(context)).isFalse()
		}

		@Test
		@DisableFlags(Flags.FLAG_ENABLE_SUPERVISION_PIN_RECOVERY_SCREEN)
		fun flagDisabled_recoveryInfoNotExist_notAvailable() {
		whenever(mockSupervisionManager.supervisionRecoveryInfo).thenReturn(null)

		assertThat(preference.isAvailable(context)).isFalse()
		}

		@Test
		fun onClick_triggersPinRecoveryActivity() {
		val widget: Preference = preference.createAndBindWidget(context)

		mockLifeCycleContext.stub {
		on { findPreference<Preference>(SupervisionUpdateRecoveryEmailPreference.KEY) } doReturn
		widget
		}

		widget.performClick()

		verifyPinRecoveryActivityStarted()
		}

		private fun verifyPinRecoveryActivityStarted() {
		val intentCaptor = argumentCaptor<Intent>()
		verify(mockLifeCycleContext)
		.startActivityForResult(
		intentCaptor.capture(),
		eq(SupervisionAddRecoveryPreference.ADD_RECOVERY_REQUEST_CODE),
		eq(null),
		)
		assertThat(intentCaptor.allValues.size).isEqualTo(1)
		assertThat(intentCaptor.firstValue.component?.className)
		.isEqualTo(SupervisionPinRecoveryActivity::class.java.name)
		assertThat(intentCaptor.firstValue.action)
		.isEqualTo(SupervisionPinRecoveryActivity.ACTION_SETUP_VERIFIED)
		}
		}