From b45ce6ae06d4fd5b5100eaab6c6ca3764fde8c88 Mon Sep 17 00:00:00 2001 From: Blackchai Date: Mon, 1 Jul 2019 10:55:54 -0600 Subject: [PATCH] [Student][RC 6.5.1] Fix crash from layout collision (#138) --- .../submissionDetails/content/MediaSubmissionViewFragment.kt | 2 +- ...k_control_view.xml => student_exo_playback_control_view.xml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename apps/student/src/main/res/layout/{exo_playback_control_view.xml => student_exo_playback_control_view.xml} (100%) diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/MediaSubmissionViewFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/MediaSubmissionViewFragment.kt index 84d050423a..29ecde5758 100644 --- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/MediaSubmissionViewFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/MediaSubmissionViewFragment.kt @@ -33,7 +33,7 @@ import com.instructure.pandautils.dialogs.MobileDataWarningDialog import com.instructure.student.R import com.instructure.student.mobius.assignmentDetails.submissionDetails.SubmissionDetailsContentType import com.instructure.student.router.RouteMatcher -import kotlinx.android.synthetic.main.exo_playback_control_view.* +import kotlinx.android.synthetic.main.student_exo_playback_control_view.* import kotlinx.android.synthetic.main.fragment_media_submission_view.* class MediaSubmissionViewFragment : Fragment() { diff --git a/apps/student/src/main/res/layout/exo_playback_control_view.xml b/apps/student/src/main/res/layout/student_exo_playback_control_view.xml similarity index 100% rename from apps/student/src/main/res/layout/exo_playback_control_view.xml rename to apps/student/src/main/res/layout/student_exo_playback_control_view.xml