Merge "Move XYZDependent to extension functions" into main (2fd74269) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accessibility/detail/a11yactivity/SettingsPreferenceController.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,11 +20,11 @@ import android.accessibilityservice.AccessibilityShortcutInfo
		import android.content.ComponentName
		import android.content.Context
		import android.content.Intent
		import com.android.settings.accessibility.extensions.isInSetupWizard
		import com.android.settings.accessibility.shared.LaunchIntentPreferenceController
		import com.android.settings.accessibility.shared.SetupWizardDependent

		class SettingsPreferenceController(context: Context, prefKey: String) :
		LaunchIntentPreferenceController(context, prefKey), SetupWizardDependent{
		LaunchIntentPreferenceController(context, prefKey) {
		fun initialize(shortcutInfo: AccessibilityShortcutInfo) {
		val settingsIntent =
		shortcutInfo.settingsActivityName?.let {
		@@ -43,7 +43,7 @@ class SettingsPreferenceController(context: Context, prefKey: String) :
		}

		override fun getAvailabilityStatus(): Int {
		return if (isInSetupWizard(mContext)) {
		return if (mContext.isInSetupWizard()) {
		CONDITIONALLY_UNAVAILABLE
		} else {
		super.getAvailabilityStatus()

+5 −8

Original line number	Diff line number	Diff line
		@@ -35,15 +35,12 @@ import com.android.settings.accessibility.MagnificationCapabilities
		import com.android.settings.accessibility.MagnificationCapabilities.MagnificationMode
		import com.android.settings.accessibility.MagnificationCapabilities.MagnificationMode.ALL
		import com.android.settings.accessibility.MagnificationCapabilities.MagnificationMode.FULLSCREEN
		import com.android.settings.accessibility.shared.SetupWizardDependent
		import com.android.settings.accessibility.shared.WindowMagnificationDependent
		import com.android.settings.accessibility.extensions.isInSetupWizard
		import com.android.settings.accessibility.extensions.isWindowMagnificationSupported
		import com.android.settings.core.TogglePreferenceController

		class OneFingerPanningPreferenceController(context: Context, prefKey: String) :
		TogglePreferenceController(context, prefKey),
		DefaultLifecycleObserver,
		SetupWizardDependent,
		WindowMagnificationDependent {
		TogglePreferenceController(context, prefKey), DefaultLifecycleObserver {
		private var switchPreference: TwoStatePreference? = null

		private val contentObserver: ContentObserver =
		@@ -64,8 +61,8 @@ class OneFingerPanningPreferenceController(context: Context, prefKey: String) :
		override fun getAvailabilityStatus(): Int {
		return if (
		Flags.enableMagnificationOneFingerPanningGesture() &&
		!isInSetupWizard(mContext) &&
		isWindowMagnificationSupported(mContext)
		!mContext.isInSetupWizard() &&
		mContext.isWindowMagnificationSupported()
		) {
		AVAILABLE
		} else {

+12 −8

Original line number	Diff line number	Diff line
		@@ -14,18 +14,22 @@
		* limitations under the License.
		*/

		package com.android.settings.accessibility.shared
		package com.android.settings.accessibility.extensions

		import android.app.Activity
		import android.content.Context
		import android.content.pm.PackageManager
		import com.android.internal.R
		import com.android.settingslib.widget.SetupWizardHelper

		interface SetupWizardDependent {
		fun Context.isWindowMagnificationSupported(): Boolean {
		return resources.getBoolean(R.bool.config_magnification_area) &&
		packageManager.hasSystemFeature(PackageManager.FEATURE_WINDOW_MAGNIFICATION)
		}

		fun isInSetupWizard(context: Context): Boolean {
		if(context is Activity) {
		return SetupWizardHelper.isAnySetupWizard(context.intent)
		fun Context.isInSetupWizard(): Boolean {
		if (this is Activity) {
		return SetupWizardHelper.isAnySetupWizard(intent)
		}
		return false
		}
		No newline at end of file
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -21,9 +21,10 @@ import android.content.Context
		import android.content.Intent
		import android.provider.Settings
		import androidx.core.net.toUri
		import com.android.settings.accessibility.extensions.isInSetupWizard

		class LaunchAppInfoPreferenceController(context: Context, prefKey: String) :
		LaunchIntentPreferenceController(context, prefKey), SetupWizardDependent {
		LaunchIntentPreferenceController(context, prefKey) {

		fun initialize(componentName: ComponentName) {
		if (!mContext.packageManager.isPackageAvailable(componentName.packageName)) {
		@@ -40,7 +41,7 @@ class LaunchAppInfoPreferenceController(context: Context, prefKey: String) :
		}

		override fun getAvailabilityStatus(): Int {
		return if (isInSetupWizard(mContext)) {
		return if (mContext.isInSetupWizard()) {
		CONDITIONALLY_UNAVAILABLE
		} else {
		super.getAvailabilityStatus()

deleted100644 → 0

+0 −31

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.accessibility.shared

		import android.content.Context
		import android.content.pm.PackageManager
		import com.android.internal.R

		interface WindowMagnificationDependent {

		fun isWindowMagnificationSupported(context: Context): Boolean {
		return context.resources.getBoolean(R.bool.config_magnification_area) &&
		context
		.packageManager
		.hasSystemFeature(PackageManager.FEATURE_WINDOW_MAGNIFICATION)
		}
		}