X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Factivity_webview.xml;h=d085905f54cc039cae26715eaf794b2e5845955d;hb=828458a749772bd036f9e2747bd9f6bf9c468691;hp=2b701ae033cad6edcf1c8e3cd7a34e37e33a9f80;hpb=4a4b7dcb93d79b7ab729e41d67be694630da217e;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index 2b701ae0..d085905f 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -1,58 +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" >
 
-    // FrameLayout lets the ProgressBar float on top of the LinearLayout.
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/topFrameLayout">
-
-        <LinearLayout
+        <!-- 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:orientation="horizontal"
-            android:id="@+id/topBarLayout">
-
-            // android:inputType="textUri" sets the keyboard to have a go arrow.
-            <EditText
-                android:id="@+id/urlTextBox"
-                android:layout_width="0dp"
-                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="loadUrlFromTextBox"
-                style="?android:attr/buttonStyleSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-            </LinearLayout>
-
-        // android:max changes the maximum ProgressBar value from 10000 to 100 to match progress percentage.
-        <ProgressBar
-            android:id="@+id/progressBar"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="7dp"
-            android:layout_gravity="bottom"
-            android:max="100"
-            android:progressTint="#FF29A8FF"
-            android:progressBackgroundTint="#FFFFFFFF"
-            android:visibility="gone" />
-    </FrameLayout>
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:layout_marginTop="?attr/actionBarSize"/>
 
-    <WebView
-        android:id="@+id/mainWebView"
-        android:layout_width="match_parent"
-        android:layout_height="fill_parent"
-        android:layout_below="@id/topFrameLayout"
-        android:focusable="true"
-        android:focusableInTouchMode="true" />
-</RelativeLayout>
+</ScrollView>