Merge "[Catalyst] Clean up SupervisionPinManagementFragment" into main (5672b1ff) · Commits · e / os / android_packages_apps_Settings

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

deleted100644 → 0

+0 −29

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 com.android.settingslib.preference.PreferenceFragment

		/**
		* Fragment to display the Supervision PIN management page (Settings > Supervision > Manage PIN).
		*
		* See [SupervisionPinManagementScreen] for details on the page contents.
		*/
		class SupervisionPinManagementFragment : PreferenceFragment() {
		override fun getPreferenceScreenBindingKey(context: Context) =
		SupervisionPinManagementScreen.KEY
		}

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -15,25 +15,26 @@
		*/
		package com.android.settings.supervision

		import android.app.settings.SettingsEnums
		import android.app.settings.SettingsEnums.ACTION_SUPERVISION_MANAGE_PIN
		import android.app.supervision.SupervisionManager
		import android.app.supervision.SupervisionRecoveryInfo.STATE_PENDING
		import android.app.supervision.flags.Flags
		import android.content.Context
		import com.android.settings.R
		import com.android.settings.core.PreferenceScreenMixin
		import com.android.settings.metrics.PreferenceActionMetricsProvider
		import com.android.settingslib.metadata.PreferenceAvailabilityProvider
		import com.android.settingslib.metadata.PreferenceIconProvider
		import com.android.settingslib.metadata.PreferenceSummaryProvider
		import com.android.settingslib.metadata.ProvidePreferenceScreen
		import com.android.settingslib.metadata.preferenceHierarchy
		import com.android.settingslib.preference.PreferenceScreenCreator
		import com.android.settingslib.widget.UntitledPreferenceCategoryMetadata

		/** Pin Management landing page (Settings > Supervision > Manage Pin). */
		@ProvidePreferenceScreen(SupervisionPinManagementScreen.KEY)
		class SupervisionPinManagementScreen :
		PreferenceScreenCreator,
		PreferenceScreenMixin,
		PreferenceAvailabilityProvider,
		PreferenceSummaryProvider,
		PreferenceActionMetricsProvider,
		@@ -47,6 +48,11 @@ class SupervisionPinManagementScreen :
		override val title: Int
		get() = R.string.supervision_pin_management_preference_title

		override val highlightMenuKey: Int
		get() = R.string.menu_key_supervision

		override fun getMetricsCategory() = SettingsEnums.SUPERVISION_MANAGE_PIN_SCREEN

		// There is an implicit dependency on SupervisionSetupRecoveryPreference due to `getSummary`,
		// which can be removed if `SupervisionManager.supervisionRecoveryInfo` supports
		// observer/listener mechanism on change.
		@@ -86,8 +92,6 @@ class SupervisionPinManagementScreen :
		return R.drawable.ic_pin_outline
		}

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

		override fun getPreferenceHierarchy(context: Context) =
		preferenceHierarchy(context, this) {
		+SupervisionSetupRecoveryPreference()