From: Soren Stoutner <soren@stoutner.com>
Date: Thu, 12 Nov 2015 03:38:44 +0000 (-0700)
Subject: Remove app bar scrolling because it broke pinch to zoom and some web pages.
X-Git-Tag: v1.0~30
X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=ca8a66234c494e4bc654f9ea97298ac5728ace61;p=PrivacyBrowserAndroid.git

Remove app bar scrolling because it broke pinch to zoom and some web pages.
---

diff --git a/app/src/main/java/com/stoutner/privacybrowser/Webview.java b/app/src/main/java/com/stoutner/privacybrowser/Webview.java
index ff718ff9..99a27344 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java
@@ -33,7 +33,7 @@ public class Webview extends AppCompatActivity {
     static ProgressBar progressBar;
     static EditText urlTextBox;
     static ImageView favoriteIcon;
-    static final String homepage = "https://www.google.com/";
+    static final String homepage = "https://www.duckduckgo.com/";
 
     // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled.
     @SuppressLint("SetJavaScriptEnabled")
@@ -41,10 +41,6 @@ public class Webview extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-        // FEATURE_ACTION_BAR_OVERLAY is required to scroll the actionBar.
-        supportRequestWindowFeature(AppCompatDelegate.FEATURE_SUPPORT_ACTION_BAR_OVERLAY);
-
         setContentView(R.layout.activity_webview);
 
         mainWebView = (WebView) findViewById(R.id.mainWebView);
@@ -62,9 +58,6 @@ public class Webview extends AppCompatActivity {
             favoriteIcon = (ImageView) actionBar.getCustomView().findViewById(R.id.favoriteIcon);
             urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox);
             progressBar = (ProgressBar) actionBar.getCustomView().findViewById(R.id.progressBar);
-
-            // Scroll the actionBar.
-            actionBar.setHideOnContentScrollEnabled(true);
         }
 
         mainWebView.setWebViewClient(new WebViewClient() {
diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index d085905f..d565fc0b 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -1,18 +1,14 @@
-<!-- nextedScrollingEnabled is required to enable scrolling of the actionBar. -->
-<ScrollView
-    android:id="@+id/scrollView"
+<RelativeLayout
+    android:id="@+id/relativeLayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:nestedScrollingEnabled="true" >
+    android:layout_height="match_parent">
 
-        <!-- 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:layout_height="match_parent"
             android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:layout_marginTop="?attr/actionBarSize"/>
+            android:focusableInTouchMode="true" />
 
-</ScrollView>
+</RelativeLayout>