diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 16:04:00 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 16:04:00 +0000 |
commit | b76448b6994d95fa733fcecf5231a425993f07a6 (patch) | |
tree | b4a1af0e9e002b5b5c88aa0283beea9eac549e21 | |
parent | 25bad739d1f19bb2e01b4008014cbd7027209c5f (diff) | |
parent | fad091f839fe143a5f81c4c8e43bbaf7d2c2a9c5 (diff) | |
download | Calendar-android13-frc-scheduling-release.tar.gz |
Snap for 8512216 from fad091f839fe143a5f81c4c8e43bbaf7d2c2a9c5 to tm-frc-scheduling-releaset_frc_sch_330443040t_frc_sch_330443010android13-frc-scheduling-release
Change-Id: I66c314100fb2e0eb8761fd03bef58ee295e8e7f4
-rw-r--r-- | src/com/android/calendar/AllInOneActivity.kt | 8 | ||||
-rw-r--r-- | src/com/android/calendar/DayView.kt | 16 | ||||
-rw-r--r-- | src/com/android/calendar/EventInfoFragment.kt | 6 | ||||
-rw-r--r-- | src/com/android/calendar/month/MonthByWeekAdapter.kt | 4 | ||||
-rw-r--r-- | src/com/android/calendar/month/SimpleWeeksAdapter.kt | 2 |
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 } } |