Implement a working two-paned mode for `DomainsActivity`.

[PrivacyBrowserAndroid.git] / app / src / free / res / layout / main_webview.xml

diff --git a/app/src/free/res/layout/main_webview.xml b/app/src/free/res/layout/main_webview.xml
index c7bf4b0fb2f8ec69f0b334c118c64aacdaad80e0..6013ae2901489ef5eaaac16e9d567e8a21bca95b 100644 (file)
--- a/app/src/free/res/layout/main_webview.xml
+++ b/app/src/free/res/layout/main_webview.xml
@@ -18,17 +18,18 @@
   You should have received a copy of the GNU General Public License
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<!-- android:layout_martinTop="?attr/actionBarSize" moves adRelativeLayout below the appBarLayout, which otherwise would cover the top of mainWebView. -->
+<!-- android:layout_martinTop="?attr/actionBarSize" moves adRelativeLayout below the appBarLayout, which otherwise would cover the top of mainWebView.
+  android:layout_weight="1" sets the RelativeLayout to fill the rest of the screen because it is encapsulated in a LinearLayout with android:orientation="vertical"-->
 <RelativeLayout
-    android:id="@+id/adRelativeLayout"
+    android:id="@+id/main_webview_relativelayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginTop="?attr/actionBarSize"
-    tools:context="com.stoutner.privacybrowser.MainWebViewActivity"
-    tools:showIn="@layout/activity_webview">
+    android:layout_height="0dp"
+    android:layout_weight="1"
+    tools:context="com.stoutner.privacybrowser.activities.MainWebViewActivity"
+    tools:showIn="@layout/drawerlayout">
 
     <com.google.android.gms.ads.AdView
         android:id="@+id/adView"
@@ -36,7 +37,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true"
-        ads:adSize="BANNER"
+        ads:adSize="SMART_BANNER"
         ads:adUnitId="@string/ad_id">
     </com.google.android.gms.ads.AdView>
 
@@ -52,6 +53,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:focusable="true"
-            android:focusableInTouchMode="true"/>
+            android:focusableInTouchMode="true" />
     </android.support.v4.widget.SwipeRefreshLayout>
 </RelativeLayout>
\ No newline at end of file