Snap for 8509668 from 1dc0f77a850c96f396389b96716ff5b3bd2329b1 to tm-qpr1-release

Change-Id: I1e99dac01534c1df0f4c5c1e5760d8d5b69b4cc8

5 files changed, 13 insertions, 13 deletions

diff --git a/src/com/android/deskclock/ItemAnimator.kt b/src/com/android/deskclock/ItemAnimator.kt
index a1791b507..727204ff8 100644
--- a/src/com/android/deskclock/ItemAnimator.kt
+++ b/src/com/android/deskclock/ItemAnimator.kt
@@ -125,11 +125,11 @@ class ItemAnimator : SimpleItemAnimator() {
         moveAnimator?.duration = moveDuration
         moveAnimator.interpolator = AnimatorUtils.INTERPOLATOR_FAST_OUT_SLOW_IN
         moveAnimator.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationStart(animator: Animator?) {
+            override fun onAnimationStart(animator: Animator) {
                 dispatchMoveStarting(holder)
             }
 
-            override fun onAnimationEnd(animator: Animator?) {
+            override fun onAnimationEnd(animator: Animator) {
                 animator?.removeAllListeners()
                 mAnimators.remove(holder)
                 view.translationX = prevTranslationX
diff --git a/src/com/android/deskclock/alarms/AlarmActivity.kt b/src/com/android/deskclock/alarms/AlarmActivity.kt
index 4acc9003d..a4caf1a74 100644
--- a/src/com/android/deskclock/alarms/AlarmActivity.kt
+++ b/src/com/android/deskclock/alarms/AlarmActivity.kt
@@ -560,7 +560,7 @@ class AlarmActivity : BaseActivity(), View.OnClickListener, View.OnTouchListener
         bounceAnimator.setInterpolator(AnimatorUtils.DECELERATE_ACCELERATE_INTERPOLATOR)
         bounceAnimator.setDuration(ALARM_BOUNCE_DURATION_MILLIS.toLong())
         bounceAnimator.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationStart(animator: Animator?) {
+            override fun onAnimationStart(animator: Animator) {
                 mHintView.setText(hintResId)
                 if (mHintView.getVisibility() != View.VISIBLE) {
                     mHintView.setVisibility(View.VISIBLE)
@@ -606,7 +606,7 @@ class AlarmActivity : BaseActivity(), View.OnClickListener, View.OnTouchListener
         revealAnimator.setDuration(ALERT_REVEAL_DURATION_MILLIS.toLong())
         revealAnimator.setInterpolator(REVEAL_INTERPOLATOR)
         revealAnimator.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animator: Animator?) {
+            override fun onAnimationEnd(animator: Animator) {
                 mAlertView.setVisibility(View.VISIBLE)
                 mAlertTitleView.setText(titleResId)
                 if (infoText != null) {
@@ -621,7 +621,7 @@ class AlarmActivity : BaseActivity(), View.OnClickListener, View.OnTouchListener
         val fadeAnimator: ValueAnimator = ObjectAnimator.ofFloat(revealView, View.ALPHA, 0.0f)
         fadeAnimator.setDuration(ALERT_FADE_DURATION_MILLIS.toLong())
         fadeAnimator.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator?) {
+            override fun onAnimationEnd(animation: Animator) {
                 containerView.removeView(revealView)
             }
         })
@@ -629,7 +629,7 @@ class AlarmActivity : BaseActivity(), View.OnClickListener, View.OnTouchListener
         val alertAnimator = AnimatorSet()
         alertAnimator.play(revealAnimator).before(fadeAnimator)
         alertAnimator.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animator: Animator?) {
+            override fun onAnimationEnd(animator: Animator) {
                 mAlertView.announceForAccessibility(accessibilityText)
                 mHandler.postDelayed(Runnable { finish() }, ALERT_DISMISS_DELAY_MILLIS.toLong())
             }
diff --git a/src/com/android/deskclock/alarms/dataadapter/CollapsedAlarmViewHolder.kt b/src/com/android/deskclock/alarms/dataadapter/CollapsedAlarmViewHolder.kt
index 2b72c391a..9eac51460 100644
--- a/src/com/android/deskclock/alarms/dataadapter/CollapsedAlarmViewHolder.kt
+++ b/src/com/android/deskclock/alarms/dataadapter/CollapsedAlarmViewHolder.kt
@@ -153,7 +153,7 @@ class CollapsedAlarmViewHolder private constructor(itemView: View) : AlarmItemVi
             createExpandingAnimator(newHolder, duration)
         }
         changeAnimatorSet.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animator: Animator?) {
+            override fun onAnimationEnd(animator: Animator) {
                 clock.visibility = View.VISIBLE
                 onOff.visibility = View.VISIBLE
                 arrow.visibility = View.VISIBLE
@@ -226,7 +226,7 @@ class CollapsedAlarmViewHolder private constructor(itemView: View) : AlarmItemVi
         val animatorSet = AnimatorSet()
         animatorSet.playTogether(alphaAnimatorSet, boundsAnimator, arrowAnimation)
         animatorSet.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationStart(animator: Animator?) {
+            override fun onAnimationStart(animator: Animator) {
                 AnimatorUtils.startDrawableAnimation(arrow)
             }
         })
diff --git a/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.kt b/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.kt
index 5215b2b46..f6baef9a0 100644
--- a/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.kt
+++ b/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.kt
@@ -254,7 +254,7 @@ class ExpandedAlarmViewHolder private constructor(itemView: View, private val mH
                 ObjectAnimator.ofFloat(delete, TRANSLATION_Y, 0f),
                 ObjectAnimator.ofFloat(arrow, TRANSLATION_Y, 0f))
         animatorSet.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animator: Animator?) {
+            override fun onAnimationEnd(animator: Animator) {
                 setTranslationY(0f, 0f)
                 repeatDays.alpha = 1f
                 repeatDays.visibility = if (isExpansion) View.VISIBLE else View.GONE
@@ -298,7 +298,7 @@ class ExpandedAlarmViewHolder private constructor(itemView: View, private val mH
             createCollapsingAnimator(newHolder, duration)
         }
         changeAnimatorSet.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animator: Animator?) {
+            override fun onAnimationEnd(animator: Animator) {
                 AnimatorUtils.setBackgroundAlpha(itemView, 255)
                 clock.visibility = View.VISIBLE
                 onOff.visibility = View.VISIBLE
@@ -453,7 +453,7 @@ class ExpandedAlarmViewHolder private constructor(itemView: View, private val mH
                 repeatDaysAnimation, vibrateAnimation, ringtoneAnimation, editLabelAnimation,
                 deleteAnimation, hairLineAnimation, dismissAnimation, arrowAnimation)
         animatorSet.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationStart(animator: Animator?) {
+            override fun onAnimationStart(animator: Animator) {
                 AnimatorUtils.startDrawableAnimation(arrow)
             }
         })
diff --git a/src/com/android/deskclock/settings/AlarmVolumePreference.kt b/src/com/android/deskclock/settings/AlarmVolumePreference.kt
index 5270f2193..34638e5eb 100644
--- a/src/com/android/deskclock/settings/AlarmVolumePreference.kt
+++ b/src/com/android/deskclock/settings/AlarmVolumePreference.kt
@@ -69,12 +69,12 @@ class AlarmVolumePreference(context: Context?, attrs: AttributeSet?) : Preferenc
         }
 
         mSeekbar.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
-            override fun onViewAttachedToWindow(v: View?) {
+            override fun onViewAttachedToWindow(v: View) {
                 context.getContentResolver().registerContentObserver(Settings.System.CONTENT_URI,
                         true, volumeObserver)
             }
 
-            override fun onViewDetachedFromWindow(v: View?) {
+            override fun onViewDetachedFromWindow(v: View) {
                 context.getContentResolver().unregisterContentObserver(volumeObserver)
             }
         })