Merge "Create "Change PIN" settings UI" into main (8dc9b533) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -14110,4 +14110,6 @@
		<string name="supervision_pin_management_preference_title">Manage PIN</string>
		<!-- Description for supervision PIN management settings entry, in the case of adding a PIN [CHAR LIMIT=NONE] -->
		<string name="supervision_pin_management_preference_summary_add">Add a PIN recovery method</string>
		<!-- Title for supervision change PIN setting entry [CHAR LIMIT=60] -->
		<string name="supervision_change_pin_preference_title">Change PIN</string>
		</resources>

0 → 100644

+38 −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.content.Context
		import android.content.Intent
		import com.android.settings.R
		import com.android.settingslib.metadata.PreferenceMetadata

		/**
		* Setting on PIN Management screen (Settings > Supervision > Manage Pin) that invokes the flow to
		* update the existing device supervision PIN.
		*/
		class SupervisionChangePinPreference : PreferenceMetadata {
		override val key: String
		get() = "supervision_change_pin"

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

		override fun intent(context: Context): Intent? {
		// TODO(b/393450922): implement handling of change pin intent.
		return super.intent(context)
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ class SupervisionPinManagementScreen : PreferenceScreenCreator {
		override fun getPreferenceHierarchy(context: Context) =
		preferenceHierarchy(context, this) {
		// TODO(b/391992481) implement the screen.
		+SupervisionChangePinPreference()
		}

		companion object {

0 → 100644

+36 −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.content.Context
		import androidx.test.core.app.ApplicationProvider
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.google.common.truth.Truth.assertThat
		import org.junit.Test
		import org.junit.runner.RunWith

		@RunWith(AndroidJUnit4::class)
		class SupervisionChangePinPreferenceTest {
		private val context: Context = ApplicationProvider.getApplicationContext()

		private val supervisionChangePinPreference = SupervisionChangePinPreference()

		@Test
		fun getTitle() {
		assertThat(supervisionChangePinPreference.getPreferenceTitle(context))
		.isEqualTo("Change PIN")
		}
		}