Remove swipe to refresh and add app bar scrolling (which appear to not be compatible...

[PrivacyBrowserAndroid.git] / app / src / main / res / layout / activity_webview.xml

diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index 2e4bc6035eff1565121ad26e5352c88e6fc5295d..d085905f54cc039cae26715eaf794b2e5845955d 100644 (file)
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -1,38 +1,18 @@
-<RelativeLayout
+<!-- nextedScrollingEnabled is required to enable scrolling of the actionBar. -->
+<ScrollView
+    android:id="@+id/scrollView"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Webview" >
+    android:nestedScrollingEnabled="true" >
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:id="@+id/topBarLayout">
-
-        <EditText
-            android:id="@+id/urlTextBox"
-            android:layout_width="wrap_content"
+        <!-- layout_marginTop is required to force the top of the website below the overlayed actionBar. -->
+        <WebView
+            android:id="@+id/mainWebView"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="textUri"
-            android:imeOptions="actionGo"
-            android:layout_weight="1"/>
-
-        <Button
-            android:id="@+id/goButton"
-            android:text="@string/go_button"
-            android:onClick="loadUrl"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:layout_marginTop="?attr/actionBarSize"/>
 
-    <WebView
-        android:id="@+id/mainWebView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/topBarLayout"
-        android:focusable="true"
-        android:focusableInTouchMode="true" />
-</RelativeLayout>
+</ScrollView>