diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-05 03:08:34 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-05 03:08:34 +0000 |
commit | 4dfe536ed03e1f650cfe9b7e945621e9c836623c (patch) | |
tree | bcc10c5729379b8c5d8c2054a05c8526a5c3a371 | |
parent | 0a5c21480aa58f3c54a04642dcb44204d167409d (diff) | |
parent | aab1821020a5cf64b3603fb3787746b65ce24a3a (diff) | |
download | DeskClock-android13-qpr1-s3-release.tar.gz |
Snap for 8543353 from aab1821020a5cf64b3603fb3787746b65ce24a3a to tm-qpr1-releaseandroid-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-release
Change-Id: I8c208d875789361fe7605bee3ebe30bdcc9f7d58
3 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/deskclock/settings/AlarmVolumePreference.kt b/src/com/android/deskclock/settings/AlarmVolumePreference.kt index 34638e5eb..dd08eea48 100644 --- a/src/com/android/deskclock/settings/AlarmVolumePreference.kt +++ b/src/com/android/deskclock/settings/AlarmVolumePreference.kt @@ -38,7 +38,7 @@ import com.android.deskclock.RingtonePreviewKlaxon import com.android.deskclock.Utils import com.android.deskclock.data.DataModel -class AlarmVolumePreference(context: Context?, attrs: AttributeSet?) : Preference(context, attrs) { +class AlarmVolumePreference(context: Context?, attrs: AttributeSet?) : Preference(context!!, attrs) { private lateinit var mSeekbar: SeekBar private var mPreviewPlaying = false diff --git a/src/com/android/deskclock/settings/ScreensaverSettingsActivity.kt b/src/com/android/deskclock/settings/ScreensaverSettingsActivity.kt index 3199b7ccf..dfe68dc72 100644 --- a/src/com/android/deskclock/settings/ScreensaverSettingsActivity.kt +++ b/src/com/android/deskclock/settings/ScreensaverSettingsActivity.kt @@ -60,7 +60,7 @@ class ScreensaverSettingsActivity : AppCompatActivity() { } } - override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String) { + override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { addPreferencesFromResource(R.xml.screensaver_settings) } @@ -89,4 +89,4 @@ class ScreensaverSettingsActivity : AppCompatActivity() { const val KEY_CLOCK_STYLE = "screensaver_clock_style" const val KEY_NIGHT_MODE = "screensaver_night_mode" } -}
\ No newline at end of file +} diff --git a/src/com/android/deskclock/settings/SimpleMenuPreference.kt b/src/com/android/deskclock/settings/SimpleMenuPreference.kt index 9eee1b464..7fb8cb83a 100644 --- a/src/com/android/deskclock/settings/SimpleMenuPreference.kt +++ b/src/com/android/deskclock/settings/SimpleMenuPreference.kt @@ -36,7 +36,7 @@ class SimpleMenuPreference( attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int -) : DropDownPreference(context, attrs, defStyleAttr, defStyleRes) { +) : DropDownPreference(context!!, attrs, defStyleAttr, defStyleRes) { private lateinit var mAdapter: SimpleMenuAdapter constructor(context: Context?) : this(context, null) { @@ -55,9 +55,9 @@ class SimpleMenuPreference( return mAdapter } - override fun setSummary(summary: CharSequence) { + override fun setSummary(summary: CharSequence?) { val entries: Array<CharSequence> = getEntries() - val index = Utils.indexOf(entries, summary) + val index = Utils.indexOf(entries, summary!!) require(index != -1) { "Illegal Summary" } val lastSelectedOriginalPosition = mAdapter.lastSelectedOriginalPosition mAdapter.setSelectedPosition(index) @@ -133,4 +133,4 @@ class SimpleMenuPreference( swapSelectedToFront(array, originalPosition) } } -}
\ No newline at end of file +} |