donjohanliebert/hardware_xiaomi
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dolby: Fix build with kotlinc 1.9.0

Browse Source 
Reformat the code while at it

Change-Id: I4f9fdc9d25eb57240612cff1b3bef3663014f9a8
This commit is contained in:
basamaryan 2024-07-19 12:08:57 +02:00
parent ee3cc7643e
commit 04b6e81293
No known key found for this signature in database
GPG Key ID: 707BA6C82329E8F9
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dolby/src/co/aospa/dolby/xiaomi/DolbyActivity.kt
View File

@ -17,7 +17,7 @@ class DolbyActivity : CollapsingToolbarBaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
fragmentManager.beginTransaction()
.replace(com.android.settingslib.collapsingtoolbar.R.id.content_frame, DolbySettingsFragment(), TAG)
.commit()
.replace(com.android.settingslib.collapsingtoolbar.R.id.content_frame, DolbySettingsFragment(), TAG)
.commit()
}
}

32
dolby/src/co/aospa/dolby/xiaomi/DolbyController.kt
View File

@ -57,10 +57,10 @@ internal class DolbyController private constructor(
field = value
dlog(TAG, "setRegisterCallbacks($value)")
if (value) {
audioManager.registerAudioPlaybackCallback(playbackCallback, handler)
audioManager!!.registerAudioPlaybackCallback(playbackCallback, handler)
audioManager.registerAudioDeviceCallback(audioDeviceCallback, handler)
} else {
audioManager.unregisterAudioPlaybackCallback(playbackCallback)
audioManager!!.unregisterAudioPlaybackCallback(playbackCallback)
audioManager.unregisterAudioDeviceCallback(audioDeviceCallback)
}
}
@ -102,13 +102,13 @@ internal class DolbyController private constructor(
dsOn = prefs.getBoolean(DolbyConstants.PREF_ENABLE, true)
context.resources.getStringArray(R.array.dolby_profile_values)
.map { it.toInt() }
.forEach { profile ->
// Reset dolby first to prevent it from loading bad settings
dolbyEffect.resetProfileSpecificSettings(profile)
// Now restore our profile-specific settings
restoreSettings(profile)
}
.map { it.toInt() }
.forEach { profile ->
// Reset dolby first to prevent it from loading bad settings
dolbyEffect.resetProfileSpecificSettings(profile)
// Now restore our profile-specific settings
restoreSettings(profile)
}
// Finally restore the current profile.
setCurrentProfile()
@ -118,14 +118,14 @@ internal class DolbyController private constructor(
dlog(TAG, "restoreSettings(profile=$profile)")
val prefs = context.getSharedPreferences("profile_$profile", Context.MODE_PRIVATE)
setPreset(
prefs.getString(DolbyConstants.PREF_PRESET, getPreset(profile)),
prefs.getString(DolbyConstants.PREF_PRESET, getPreset(profile))!!,
profile
)
setIeqPreset(
prefs.getString(
DolbyConstants.PREF_IEQ,
getIeqPreset(profile).toString()
).toInt(),
)!!.toInt(),
profile
)
setHeadphoneVirtEnabled(
@ -140,14 +140,14 @@ internal class DolbyController private constructor(
prefs.getString(
DolbyConstants.PREF_STEREO,
getStereoWideningAmount(profile).toString()
).toInt(),
)!!.toInt(),
profile
)
setDialogueEnhancerAmount(
prefs.getString(
DolbyConstants.PREF_DIALOGUE,
getDialogueEnhancerAmount(profile).toString()
).toInt(),
)!!.toInt(),
profile
)
setBassEnhancerEnabled(
@ -171,7 +171,7 @@ internal class DolbyController private constructor(
private fun setCurrentProfile() {
dlog(TAG, "setCurrentProfile")
val prefs = PreferenceManager.getDefaultSharedPreferences(context)
profile = prefs.getString(DolbyConstants.PREF_PROFILE, "0" /*dynamic*/).toInt()
profile = prefs.getString(DolbyConstants.PREF_PROFILE, "0" /*dynamic*/)!!.toInt()
}
fun getProfileName(): String? {
@ -202,8 +202,8 @@ internal class DolbyController private constructor(
dlog(TAG, "setPreset: $value")
checkEffect()
val gains = value.split(",")
.map { it.toInt() }
.toIntArray()
.map { it.toInt() }
.toIntArray()
dolbyEffect.setDapParameter(DsParam.GEQ_BAND_GAINS, gains, profile)
}

8
dolby/src/co/aospa/dolby/xiaomi/SummaryProvider.kt
View File

@ -58,13 +58,13 @@ class SummaryProvider : ContentProvider() {
): Int = 0
private fun getDolbySummary(): String {
val dolbyController = DolbyController.getInstance(context)
val dolbyController = DolbyController.getInstance(context!!)
if (!dolbyController.dsOn) {
return context.getString(R.string.dolby_off)
return context!!.getString(R.string.dolby_off)
}
return dolbyController.getProfileName()?.let {
context.getString(R.string.dolby_on_with_profile, it)
} ?: context.getString(R.string.dolby_on)
context!!.getString(R.string.dolby_on_with_profile, it)
} ?: context!!.getString(R.string.dolby_on)
}
}

12
dolby/src/co/aospa/dolby/xiaomi/preference/DolbyPreferenceStore.kt
View File

@ -40,24 +40,24 @@ class DolbyPreferenceStore(
override fun putBoolean(key: String, value: Boolean) =
getSharedPreferences(key).edit()
.putBoolean(key, value)
.apply()
.putBoolean(key, value)
.apply()
override fun getBoolean(key: String, defValue: Boolean) =
getSharedPreferences(key).getBoolean(key, defValue)
override fun putInt(key: String, value: Int) =
getSharedPreferences(key).edit()
.putInt(key, value)
.apply()
.putInt(key, value)
.apply()
override fun getInt(key: String, defValue: Int) =
getSharedPreferences(key).getInt(key, defValue)
override fun putString(key: String, value: String?) =
getSharedPreferences(key).edit()
.putString(key, value)
.apply()
.putString(key, value)
.apply()
override fun getString(key: String, defValue: String?) =
getSharedPreferences(key).getString(key, defValue)

10
dolby/src/co/aospa/dolby/xiaomi/preference/DolbySettingsFragment.kt
View File

@ -141,14 +141,14 @@ class DolbySettingsFragment : PreferenceFragment(),
true
}
audioManager.registerAudioDeviceCallback(audioDeviceCallback, handler)
audioManager!!.registerAudioDeviceCallback(audioDeviceCallback, handler)
updateSpeakerState()
updateProfileSpecificPrefs()
}
override fun onDestroyView() {
dlog(TAG, "onDestroyView")
audioManager.unregisterAudioDeviceCallback(audioDeviceCallback)
audioManager!!.unregisterAudioDeviceCallback(audioDeviceCallback)
super.onDestroyView()
}
@ -208,7 +208,7 @@ class DolbySettingsFragment : PreferenceFragment(),
}
private fun updateSpeakerState() {
val device = audioManager.getDevicesForAttributes(ATTRIBUTES_MEDIA)[0]
val device = audioManager!!.getDevicesForAttributes(ATTRIBUTES_MEDIA)[0]
isOnSpeaker = (device.type == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER)
}
@ -293,7 +293,7 @@ class DolbySettingsFragment : PreferenceFragment(),
companion object {
private const val TAG = "DolbySettingsFragment"
private val ATTRIBUTES_MEDIA = AudioAttributes.Builder()
.setUsage(AudioAttributes.USAGE_MEDIA)
.build()
.setUsage(AudioAttributes.USAGE_MEDIA)
.build()
}
}