PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "catalyst" into main

Browse Source 
* changes:
  [Catalyst] Migrate bluetooth screen to catalyst
  [Catalyst] Migrate BluetoothFooterPreference
  [Catalyst] Fully migrate BluetoothMainSwitchPreference
  [Catalyst] Add SatelliteRepository.isSatelliteOn helper method
  [Catalyst] Support callChangeListener for MainSwitchBarPreference
This commit is contained in:
Jacky Wang
2024-12-10 07:11:09 +00:00
committed by Android (Google) Code Review
parent 05783a589d efd08c4bfb
commit fdbfa69183
13 changed files with 361 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/wifi/WifiSwitchPreference.kt
View File

@@ -23,13 +23,12 @@ import android.content.IntentFilter
import android.net.wifi.WifiManager
import android.os.UserManager
import android.provider.Settings
import android.util.Log
import android.widget.Toast
import androidx.preference.Preference
import androidx.preference.Preference.OnPreferenceChangeListener
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R
import com.android.settings.network.SatelliteRepository
import com.android.settings.network.SatelliteRepository.Companion.isSatelliteOn
import com.android.settings.network.SatelliteWarningDialogActivity
import com.android.settingslib.RestrictedSwitchPreference
import com.android.settingslib.WirelessUtils
@@ -42,8 +41,6 @@ import com.android.settingslib.metadata.ReadWritePermit
import com.android.settingslib.metadata.SensitivityLevel
import com.android.settingslib.metadata.SwitchPreference
import com.android.settingslib.preference.SwitchPreferenceBinding
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit
// LINT.IfChange
class WifiSwitchPreference :
@@ -75,7 +72,7 @@ class WifiSwitchPreference :
val context = preference.context
// Show dialog and do nothing under satellite mode.
if (context.isSatelliteOn()) {
if (isSatelliteOn(context)) {
context.startActivity(
Intent(context, SatelliteWarningDialogActivity::class.java)
.putExtra(
@@ -100,7 +97,7 @@ class WifiSwitchPreference :
override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
when {
(value == true && !context.isRadioAllowed()) || context.isSatelliteOn() ->
(value == true && !context.isRadioAllowed()) || isSatelliteOn(context) ->
ReadWritePermit.DISALLOW
else -> ReadWritePermit.ALLOW
}
@@ -155,22 +152,11 @@ class WifiSwitchPreference :
}
companion object {
const val TAG = "WifiSwitchPreference"
const val KEY = "main_toggle_wifi"
private fun Context.isRadioAllowed() =
WirelessUtils.isRadioAllowed(this, Settings.Global.RADIO_WIFI)
private fun Context.isSatelliteOn() =
try {
SatelliteRepository(this)
.requestIsSessionStarted(Executors.newSingleThreadExecutor())
.get(2000, TimeUnit.MILLISECONDS)
} catch (e: Exception) {
Log.e(TAG, "Error to get satellite status : $e")
false
}
private val Intent.wifiState
get() = getIntExtra(WifiManager.EXTRA_WIFI_STATE, WifiManager.WIFI_STATE_UNKNOWN)
}