diff options
| author | Ryan O'Leary <ryanaoleary@google.com> | 2022-09-08 21:14:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-09-08 21:14:27 +0000 |
| commit | 25f0469b2c10b33e6a597247b84e90f5d461ced1 (patch) | |
| tree | acaa56b34999a6632aadefd51c2ce5066d548560 | |
| parent | 3db32acba8e8abd9dd64eb7b4bba76a0b1eb302e (diff) | |
| parent | 335b7ee16b2567385d12cab60cd00c8e2792665f (diff) | |
| download | Calendar-25f0469b2c10b33e6a597247b84e90f5d461ced1.tar.gz | |
Merge "Remove wrong class cast" am: 60f7ff67a9 am: d8f9d264d8 am: d6a974a300 am: 335b7ee16bmain-16k-with-phones
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2209077
Change-Id: I2e5eaad348683384b2988a8cf7fc32ac8e02c716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/android/calendar/AllInOneActivity.kt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/calendar/AllInOneActivity.kt b/src/com/android/calendar/AllInOneActivity.kt index 550bc548..b3b45fc1 100644 --- a/src/com/android/calendar/AllInOneActivity.kt +++ b/src/com/android/calendar/AllInOneActivity.kt @@ -293,7 +293,6 @@ class AllInOneActivity : Activity(), EventHandler, OnSharedPreferenceChangeListe mControlsParams = LayoutParams(mControlsAnimateWidth, 0) } mControlsParams?.addRule(RelativeLayout.ALIGN_PARENT_RIGHT) - as RelativeLayout.LayoutParams } else { // Make sure width is in between allowed min and max width values mControlsAnimateWidth = Math.max( @@ -1062,4 +1061,4 @@ class AllInOneActivity : Activity(), EventHandler, OnSharedPreferenceChangeListe private var mIsMultipane = false private var mIsTabletConfig = false } -}
\ No newline at end of file +} |