Snap for 8509668 from 23f45c47dee586fe441ec6adb7cc3954fd7e8114 to tm-qpr1-release
Change-Id: Ib65f112950963b89c5e612657ea3774907a41801
diff --git a/src/com/android/calendar/AllInOneActivity.kt b/src/com/android/calendar/AllInOneActivity.kt
index 1747bf5..6c2e825 100644
--- a/src/com/android/calendar/AllInOneActivity.kt
+++ b/src/com/android/calendar/AllInOneActivity.kt
@@ -122,11 +122,11 @@
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 @@
}
@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 58126f2..4262163 100644
--- a/src/com/android/calendar/DayView.kt
+++ b/src/com/android/calendar/DayView.kt
@@ -211,17 +211,17 @@
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 @@
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 @@
}
@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 @@
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 @@
}
// 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 2f007ab..fcc27fc 100644
--- a/src/com/android/calendar/EventInfoFragment.kt
+++ b/src/com/android/calendar/EventInfoFragment.kt
@@ -424,7 +424,7 @@
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 @@
}
@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 da61795..c67b356 100644
--- a/src/com/android/calendar/month/MonthByWeekAdapter.kt
+++ b/src/com/android/calendar/month/MonthByWeekAdapter.kt
@@ -308,12 +308,12 @@
*/
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 67be4d8..164f05c 100644
--- a/src/com/android/calendar/month/SimpleWeeksAdapter.kt
+++ b/src/com/android/calendar/month/SimpleWeeksAdapter.kt
@@ -243,7 +243,7 @@
*/
protected inner class CalendarGestureListener : GestureDetector.SimpleOnGestureListener() {
@Override
- override fun onSingleTapUp(e: MotionEvent?): Boolean {
+ override fun onSingleTapUp(e: MotionEvent): Boolean {
return true
}
}
