summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan O'Leary <ryanaoleary@google.com>2022-09-08 21:43:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-09-08 21:43:03 +0000
commit7a4ea6c85d285eccc0aba970cd25b02d95010d05 (patch)
treeacaa56b34999a6632aadefd51c2ce5066d548560
parent3b169d9ec428bec1098c614aebd4cb72253049ba (diff)
parent25f0469b2c10b33e6a597247b84e90f5d461ced1 (diff)
downloadCalendar-7a4ea6c85d285eccc0aba970cd25b02d95010d05.tar.gz
Merge "Remove wrong class cast" am: 60f7ff67a9 am: d8f9d264d8 am: d6a974a300 am: 335b7ee16b am: 25f0469b2c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2209077 Change-Id: I2ad4c354a3efa7df0c7cde59636a36fe53c3bd05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--src/com/android/calendar/AllInOneActivity.kt3
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
+}