From 4ade2bf3b6c6d2f98049258a5a2f4e9544ed3efb Mon Sep 17 00:00:00 2001
From: Tamas Kozmer <tamas.kozmer@instructure.com>
Date: Mon, 16 Jan 2023 11:18:08 +0100
Subject: [PATCH 1/2] Updated version

---
 apps/student/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/student/build.gradle b/apps/student/build.gradle
index ff77b65881..c64f03451e 100644
--- a/apps/student/build.gradle
+++ b/apps/student/build.gradle
@@ -55,8 +55,8 @@ android {
         applicationId "com.instructure.candroid"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 246
-        versionName = '6.21.2'
+        versionCode = 247
+        versionName = '6.21.3'
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true

From f15601e8d8706ba8fcb1b6387bc5d004384ce1aa Mon Sep 17 00:00:00 2001
From: Tamas Kozmer <72397075+tamaskozmer@users.noreply.github.com>
Date: Wed, 11 Jan 2023 13:41:43 +0100
Subject: [PATCH 2/2] [MBL-16456][Student][Teacher] Pages that import styles
 through global CSS does not load (#1827)

refs: MBL-16456
affects: Student, Teacher
release note: Fixed a bug where pages with global CSS don't load

* Student fix.

* Teacher fix

(cherry picked from commit 347694fdf662a2f8913ba8988a49e99947b8d425)
---
 .../student/fragment/PageDetailsFragment.kt     |  6 ------
 .../src/main/res/layout/fragment_webview.xml    | 17 ++++-------------
 .../main/res/layout/fragment_page_details.xml   | 16 ++++------------
 3 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/apps/student/src/main/java/com/instructure/student/fragment/PageDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/PageDetailsFragment.kt
index f9ca978a8f..7d8d074904 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/PageDetailsFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/PageDetailsFragment.kt
@@ -126,12 +126,6 @@ class PageDetailsFragment : InternalWebviewFragment(), Bookmarkable {
                 }
             }
         }
-
-        val layoutParams = getCanvasWebView()?.layoutParams
-        layoutParams?.let {
-            it.height = ViewGroup.LayoutParams.WRAP_CONTENT
-            getCanvasWebView()?.layoutParams = it
-        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/apps/student/src/main/res/layout/fragment_webview.xml b/apps/student/src/main/res/layout/fragment_webview.xml
index 9decf71b26..0dd387ac12 100644
--- a/apps/student/src/main/res/layout/fragment_webview.xml
+++ b/apps/student/src/main/res/layout/fragment_webview.xml
@@ -35,21 +35,12 @@
         app:theme="@style/ToolBarStyle"
         tools:targetApi="lollipop" />
 
-    <ScrollView
+    <com.instructure.pandautils.views.CanvasWebViewWrapper
+        android:id="@+id/canvasWebViewWrapper"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:scrollbarStyle="outsideOverlay"
-        android:clipToPadding="false"
-        android:layout_below="@id/toolbar">
-
-        <com.instructure.pandautils.views.CanvasWebViewWrapper
-            android:id="@+id/canvasWebViewWrapper"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/backgroundLightest"/>
-
-    </ScrollView>
+        android:layout_below="@id/toolbar"
+        android:background="@color/backgroundLightest" />
 
     <ProgressBar
         android:id="@+id/webViewLoading"
diff --git a/apps/teacher/src/main/res/layout/fragment_page_details.xml b/apps/teacher/src/main/res/layout/fragment_page_details.xml
index 1f5b86c152..60e2eb6680 100644
--- a/apps/teacher/src/main/res/layout/fragment_page_details.xml
+++ b/apps/teacher/src/main/res/layout/fragment_page_details.xml
@@ -32,21 +32,13 @@
         app:theme="@style/ToolBarStyle"
         tools:ignore="UnusedAttribute" />
 
-    <ScrollView
+    <com.instructure.pandautils.views.CanvasWebViewWrapper
+        android:id="@+id/canvasWebViewWraper"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_below="@id/toolbar"
-        android:scrollbarStyle="outsideOverlay"
         android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:clipToPadding="false">
-
-        <com.instructure.pandautils.views.CanvasWebViewWrapper
-            android:id="@+id/canvasWebViewWraper"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-    </ScrollView>
+        android:layout_marginBottom="8dp" />
 
     <com.instructure.loginapi.login.view.CanvasLoadingView
         android:id="@+id/loading"