diff options
author | Xin Li <delphij@google.com> | 2022-06-27 23:39:03 +0000 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2022-06-27 23:39:03 +0000 |
commit | 56fb32d8e332f77b3be9d305cb9411c12a2469e0 (patch) | |
tree | b4a1af0e9e002b5b5c88aa0283beea9eac549e21 | |
parent | b1becd0416dd17a98412105daafbbbcd3ec83ed6 (diff) | |
parent | a45aad36bb9e089e138477d862de38dd61997b9c (diff) | |
download | Calendar-56fb32d8e332f77b3be9d305cb9411c12a2469e0.tar.gz |
Merge tm-dev-plus-aosp-without-vendor@8763363
Bug: 236760014
Merged-In: I320e8846d90e44b22ab5fe2a4afb69e711e38ba9
Change-Id: Ie880edf795b1575911aedc2414f69715c5a91840
-rw-r--r-- | AndroidManifest.xml | 1 | ||||
-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 |
6 files changed, 19 insertions, 18 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 686be7a6..fed61b0c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -38,6 +38,7 @@ <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.mail" /> + <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30"></uses-sdk> 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 } } |