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

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

diff --git a/app/src/main/res/layout/drawerlayout.xml b/app/src/main/res/layout/drawerlayout.xml
index 903a724dcfa12f2c06e79748323e197e9d5dedc8..ca8cffedbdd650ba613c333740fdf532fc8eb2be 100644 (file)
--- a/app/src/main/res/layout/drawerlayout.xml
+++ b/app/src/main/res/layout/drawerlayout.xml
@@ -31,7 +31,7 @@
     <android.support.design.widget.CoordinatorLayout
         android:id="@+id/root_coordinatorlayout"
         xmlns:tools="http://schemas.android.com/tools"
-        tools:context="com.stoutner.privacybrowser.activities.MainWebView"
+        tools:context="com.stoutner.privacybrowser.activities.MainWebViewActivity"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:fitsSystemWindows="true"
@@ -59,7 +59,7 @@
                         android:id="@+id/app_bar"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
-                        android:background="@color/grey_100"
+                        android:background="@color/gray_100"
                         app:popupTheme="@style/LightPopupOverlay" />
 
                     <include layout="@layout/find_on_page_app_bar" />
@@ -68,16 +68,15 @@
 
             <include layout="@layout/main_webview" />
         </LinearLayout>
-    </android.support.design.widget.CoordinatorLayout>
 
-    <!-- `fullScreenVideoFrameLayout` is used to display full screen videos.  It is initially `android:visibility="gone"` to hide it from view.
-        The `FrameLayout` needs to be before the `NavigationView` or touches on the navigation drawer will not work after exiting full screen video using the back button.-->
-    <FrameLayout
-        android:id="@+id/full_screen_video_framelayout"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:visibility="gone"
-        android:background="@color/black" />
+        <!-- `full_screen_video_framelayout` is used to display full screen videos.  It is initially `android:visibility="gone"` to hide it from view. -->
+        <FrameLayout
+            android:id="@+id/full_screen_video_framelayout"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:visibility="gone"
+            android:background="@color/black" />
+    </android.support.design.widget.CoordinatorLayout>
 
     <!-- The navigation drawer. -->
     <android.support.design.widget.NavigationView