Update DeskClock to be compatible with latest Jetpack libraries am: f8de6a6c42 am: 1dc3a9b191

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/18121984

Change-Id: I45e7af4c8712e5b3e586bc5e2f8621d574e21086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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
+}