Snap for 8508895 from fad091f839fe143a5f81c4c8e43bbaf7d2c2a9c5 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r2android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-release

Change-Id: Ibe0939188f3cc413fc399b334ef5c6e8df76d7a6

5 files changed, 18 insertions, 18 deletions

diff --git a/src/com/android/calendar/AllInOneActivity.kt b/src/com/android/calendar/AllInOneActivity.kt
index 1747bf58..6c2e825f 100644
--- a/src/com/android/calendar/AllInOneActivity.kt
+++ b/src/com/android/calendar/AllInOneActivity.kt
@@ -122,11 +122,11 @@ class AllInOneActivity : Activity(), EventHandler, OnSharedPreferenceChangeListe
     private var mVerticalControlsParams: LinearLayout.LayoutParams? = null
     private val mSlideAnimationDoneListener: AnimatorListener = object : AnimatorListener {
         @Override
-        override fun onAnimationCancel(animation: Animator?) {
+        override fun onAnimationCancel(animation: Animator) {
         }
 
         @Override
-        override fun onAnimationEnd(animation: Animator?) {
+        override fun onAnimationEnd(animation: Animator) {
             val visibility: Int = if (mShowSideViews) View.VISIBLE else View.GONE
             mMiniMonth?.setVisibility(visibility)
             mCalendarsList?.setVisibility(visibility)
@@ -134,11 +134,11 @@ class AllInOneActivity : Activity(), EventHandler, OnSharedPreferenceChangeListe
         }
 
         @Override
-        override fun onAnimationRepeat(animation: Animator?) {
+        override fun onAnimationRepeat(animation: Animator) {
         }
 
         @Override
-        override fun onAnimationStart(animation: Animator?) {
+        override fun onAnimationStart(animation: Animator) {
         }
     }
 
diff --git a/src/com/android/calendar/DayView.kt b/src/com/android/calendar/DayView.kt
index 58126f20..42621638 100644
--- a/src/com/android/calendar/DayView.kt
+++ b/src/com/android/calendar/DayView.kt
@@ -211,17 +211,17 @@ class DayView(
 
     var mAnimatorListener: AnimatorListenerAdapter = object : AnimatorListenerAdapter() {
         @Override
-        override fun onAnimationStart(animation: Animator?) {
+        override fun onAnimationStart(animation: Animator) {
             mScrolling = true
         }
 
         @Override
-        override fun onAnimationCancel(animation: Animator?) {
+        override fun onAnimationCancel(animation: Animator) {
             mScrolling = false
         }
 
         @Override
-        override fun onAnimationEnd(animation: Animator?) {
+        override fun onAnimationEnd(animation: Animator) {
             mScrolling = false
             resetSelectedHour()
             invalidate()
@@ -1154,7 +1154,7 @@ class DayView(
         private val mStart: Time
         private val mEnd: Time
         @Override
-        override fun onAnimationEnd(animation: Animation?) {
+        override fun onAnimationEnd(animation: Animation) {
             var view = mViewSwitcher.getCurrentView() as DayView
             view.mViewStartX = 0
             view = mViewSwitcher.getNextView() as DayView
@@ -1168,11 +1168,11 @@ class DayView(
         }
 
         @Override
-        override fun onAnimationRepeat(animation: Animation?) {
+        override fun onAnimationRepeat(animation: Animation) {
         }
 
         @Override
-        override fun onAnimationStart(animation: Animation?) {
+        override fun onAnimationStart(animation: Animation) {
         }
 
         init {
@@ -2682,7 +2682,7 @@ class DayView(
             animator.setDuration(ANIMATION_DURATION)
             animator.addListener(object : AnimatorListenerAdapter() {
                 @Override
-                override fun onAnimationEnd(animation: Animator?) {
+                override fun onAnimationEnd(animation: Animator) {
                     if (!mCancellingAnimations) {
                         // when finished, set this to 0 to signify not animating
                         mAnimateDayHeight = 0
@@ -3038,7 +3038,7 @@ class DayView(
     }
 
     // ScaleGestureDetector.OnScaleGestureListener
-    override fun onScaleEnd(detector: ScaleGestureDetector?) {
+    override fun onScaleEnd(detector: ScaleGestureDetector) {
         mScrollStartY = mViewStartY
         mInitialScrollY = 0f
         mInitialScrollX = 0f
diff --git a/src/com/android/calendar/EventInfoFragment.kt b/src/com/android/calendar/EventInfoFragment.kt
index 2f007ab5..fcc27fc8 100644
--- a/src/com/android/calendar/EventInfoFragment.kt
+++ b/src/com/android/calendar/EventInfoFragment.kt
@@ -424,7 +424,7 @@ class EventInfoFragment : DialogFragment, OnCheckedChangeListener, CalendarContr
         mAnimateAlpha?.addListener(object : AnimatorListenerAdapter() {
             var defLayerType = 0
             @Override
-            override fun onAnimationStart(animation: Animator?) {
+            override fun onAnimationStart(animation: Animator) {
                 // Use hardware layer for better performance during animation
                 defLayerType = mScrollView?.getLayerType() as Int
                 mScrollView?.setLayerType(View.LAYER_TYPE_HARDWARE, null)
@@ -435,12 +435,12 @@ class EventInfoFragment : DialogFragment, OnCheckedChangeListener, CalendarContr
             }
 
             @Override
-            override fun onAnimationCancel(animation: Animator?) {
+            override fun onAnimationCancel(animation: Animator) {
                 mScrollView?.setLayerType(defLayerType, null)
             }
 
             @Override
-            override fun onAnimationEnd(animation: Animator?) {
+            override fun onAnimationEnd(animation: Animator) {
                 mScrollView?.setLayerType(defLayerType, null)
                 // Do not cross fade after the first time
                 mNoCrossFade = true
diff --git a/src/com/android/calendar/month/MonthByWeekAdapter.kt b/src/com/android/calendar/month/MonthByWeekAdapter.kt
index da617950..c67b3562 100644
--- a/src/com/android/calendar/month/MonthByWeekAdapter.kt
+++ b/src/com/android/calendar/month/MonthByWeekAdapter.kt
@@ -308,12 +308,12 @@ class MonthByWeekAdapter(context: Context?, params: HashMap<String?, Int?>) :
      */
     protected inner class CalendarGestureListener : GestureDetector.SimpleOnGestureListener() {
         @Override
-        override fun onSingleTapUp(e: MotionEvent?): Boolean {
+        override fun onSingleTapUp(e: MotionEvent): Boolean {
             return true
         }
 
         @Override
-        override fun onLongPress(e: MotionEvent?) {
+        override fun onLongPress(e: MotionEvent) {
             if (mLongClickedView != null) {
                 val day: Time? = mLongClickedView?.getDayFromLocation(mClickedXLocation)
                 if (day != null) {
diff --git a/src/com/android/calendar/month/SimpleWeeksAdapter.kt b/src/com/android/calendar/month/SimpleWeeksAdapter.kt
index 67be4d89..164f05c5 100644
--- a/src/com/android/calendar/month/SimpleWeeksAdapter.kt
+++ b/src/com/android/calendar/month/SimpleWeeksAdapter.kt
@@ -243,7 +243,7 @@ open class SimpleWeeksAdapter(context: Context, params: HashMap<String?, Int?>?)
      */
     protected inner class CalendarGestureListener : GestureDetector.SimpleOnGestureListener() {
         @Override
-        override fun onSingleTapUp(e: MotionEvent?): Boolean {
+        override fun onSingleTapUp(e: MotionEvent): Boolean {
             return true
         }
     }