Merge "Settings search for W-Fi calling" into main (d66e3de4) · Commits · e / os / android_packages_apps_Settings

res/xml/mobile_network_settings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -202,10 +202,12 @@
		android:title="@string/call_category"
		settings:controller="com.android.settings.network.telephony.CallingPreferenceCategoryController">

		<!-- Settings search is handled by WifiCallingSearchItem. -->
		<Preference
		android:key="wifi_calling"
		android:title="@string/wifi_calling_settings_title"
		android:summary="@string/wifi_calling_summary"
		settings:searchable="false"
		settings:controller="com.android.settings.network.telephony.WifiCallingPreferenceController">
		<intent android:action="android.intent.action.MAIN"
		android:targetPackage="com.android.settings"

src/com/android/settings/network/telephony/MobileNetworkSettingsSearchIndex.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import com.android.settings.network.SubscriptionUtil
		import com.android.settings.network.telephony.MmsMessagePreferenceController.Companion.MmsMessageSearchItem
		import com.android.settings.network.telephony.NrAdvancedCallingPreferenceController.Companion.NrAdvancedCallingSearchItem
		import com.android.settings.network.telephony.RoamingPreferenceController.Companion.RoamingSearchItem
		import com.android.settings.network.telephony.WifiCallingPreferenceController.Companion.WifiCallingSearchItem
		import com.android.settings.spa.SpaSearchLanding.BundleValue
		import com.android.settings.spa.SpaSearchLanding.SpaSearchLandingFragment
		import com.android.settings.spa.SpaSearchLanding.SpaSearchLandingKey
		@@ -112,9 +113,10 @@ class MobileNetworkSettingsSearchIndex(

		fun createSearchItems(context: Context): List<MobileNetworkSettingsSearchItem> =
		listOf(
		RoamingSearchItem(context),
		MmsMessageSearchItem(context),
		NrAdvancedCallingSearchItem(context),
		RoamingSearchItem(context),
		WifiCallingSearchItem(context),
		)
		}
		}

src/com/android/settings/network/telephony/WifiCallingPreferenceController.kt

+27 −17

Original line number	Diff line number	Diff line
		@@ -22,14 +22,17 @@ import android.telecom.TelecomManager
		import android.telephony.SubscriptionManager
		import android.telephony.TelephonyManager
		import android.telephony.ims.ImsMmTelManager
		import android.util.Log
		import androidx.lifecycle.LifecycleOwner
		import androidx.preference.Preference
		import androidx.preference.PreferenceScreen
		import com.android.settings.R
		import com.android.settings.core.BasePreferenceController
		import com.android.settings.network.telephony.MobileNetworkSettingsSearchIndex.MobileNetworkSettingsSearchItem
		import com.android.settings.network.telephony.wificalling.WifiCallingRepository
		import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
		import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.flow.first
		import kotlinx.coroutines.runBlocking
		import kotlinx.coroutines.withContext

		/**
		@@ -44,20 +47,21 @@ open class WifiCallingPreferenceController @JvmOverloads constructor(
		private val wifiCallingRepositoryFactory: (subId: Int) -> WifiCallingRepository = { subId ->
		WifiCallingRepository(context, subId)
		},
		) : TelephonyBasePreferenceController(context, key) {
		) : BasePreferenceController(context, key) {

		private var subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID
		private lateinit var preference: Preference
		private lateinit var callingPreferenceCategoryController: CallingPreferenceCategoryController

		private val resourcesForSub by lazy {
		SubscriptionManager.getResourcesForSubId(mContext, mSubId)
		SubscriptionManager.getResourcesForSubId(mContext, subId)
		}

		fun init(
		subId: Int,
		callingPreferenceCategoryController: CallingPreferenceCategoryController,
		): WifiCallingPreferenceController {
		mSubId = subId
		this.subId = subId
		this.callingPreferenceCategoryController = callingPreferenceCategoryController
		return this
		}
		@@ -65,39 +69,32 @@ open class WifiCallingPreferenceController @JvmOverloads constructor(
		/**
		* Note: Visibility also controlled by [onViewCreated].
		*/
		override fun getAvailabilityStatus(subId: Int) =
		override fun getAvailabilityStatus() =
		if (SubscriptionManager.isValidSubscriptionId(subId)) AVAILABLE
		else CONDITIONALLY_UNAVAILABLE

		override fun displayPreference(screen: PreferenceScreen) {
		// Not call super here, to avoid preference.isVisible changed unexpectedly
		preference = screen.findPreference(preferenceKey)!!
		preference.intent?.putExtra(Settings.EXTRA_SUB_ID, mSubId)
		preference.intent?.putExtra(Settings.EXTRA_SUB_ID, subId)
		}

		override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {
		if(mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID){
		Log.e(
		this.javaClass.simpleName,
		"mSubId is INVALID_SUBSCRIPTION_ID"
		)
		return
		}
		wifiCallingRepositoryFactory(mSubId).wifiCallingReadyFlow()
		wifiCallingRepositoryFactory(subId).wifiCallingReadyFlow()
		.collectLatestWithLifecycle(viewLifecycleOwner) { isReady ->
		preference.isVisible = isReady
		callingPreferenceCategoryController.updateChildVisible(preferenceKey, isReady)
		if (isReady) update()
		}

		callStateRepository.callStateFlow(mSubId).collectLatestWithLifecycle(viewLifecycleOwner) {
		callStateRepository.callStateFlow(subId).collectLatestWithLifecycle(viewLifecycleOwner) {
		preference.isEnabled = (it == TelephonyManager.CALL_STATE_IDLE)
		}
		}

		private suspend fun update() {
		val simCallManager = mContext.getSystemService(TelecomManager::class.java)
		?.getSimCallManagerForSubscription(mSubId)
		?.getSimCallManagerForSubscription(subId)
		if (simCallManager != null) {
		val intent = withContext(Dispatchers.Default) {
		MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext, simCallManager)
		@@ -116,7 +113,7 @@ open class WifiCallingPreferenceController @JvmOverloads constructor(
		}

		private fun getSummaryForWfcMode(): String {
		val resId = when (wifiCallingRepositoryFactory(mSubId).getWiFiCallingMode()) {
		val resId = when (wifiCallingRepositoryFactory(subId).getWiFiCallingMode()) {
		ImsMmTelManager.WIFI_MODE_WIFI_ONLY ->
		com.android.internal.R.string.wfc_mode_wifi_only_summary

		@@ -130,4 +127,17 @@ open class WifiCallingPreferenceController @JvmOverloads constructor(
		}
		return resourcesForSub.getString(resId)
		}

		companion object {
		class WifiCallingSearchItem(
		private val context: Context,
		) : MobileNetworkSettingsSearchItem {
		override val key: String = "wifi_calling"
		override val title: String = context.getString(R.string.wifi_calling_settings_title)

		override fun isAvailable(subId: Int): Boolean = runBlocking {
		WifiCallingRepository(context, subId).wifiCallingReadyFlow().first()
		}
		}
		}
		}