From: Soren Stoutner <soren@stoutner.com>
Date: Fri, 19 Aug 2016 04:55:44 +0000 (-0700)
Subject: Fix the navigation drawer after exiting a full screen video.  https://redmine.stoutne... 
X-Git-Tag: v1.9~5
X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=b8cd7cadd09a5336f1d34eb4a7d5b0a8330a0971;p=PrivacyBrowserAndroid.git

Fix the navigation drawer after exiting a full screen video.  https://redmine.stoutner.com/issues/28
---

diff --git a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
index 94ff1129..ca0cc89c 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
@@ -29,7 +29,6 @@ import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.net.MailTo;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
diff --git a/app/src/main/res/layout/main_coordinatorlayout.xml b/app/src/main/res/layout/main_coordinatorlayout.xml
index aaa4bd66..0dba1f95 100644
--- a/app/src/main/res/layout/main_coordinatorlayout.xml
+++ b/app/src/main/res/layout/main_coordinatorlayout.xml
@@ -26,8 +26,8 @@
     android:layout_width="match_parent">
 
     <!-- android:fitsSystemWindows="true" moves rootCoordinatorLayout below the system status bar.
-      When it is specified the theme should include <item name="android:windowTranslucentStatus">true</item>.
-      Setting the layout root to be focusableInTouchMode prevents urlTextBox from stealing focus on launch and opening the keyboard. -->
+        When it is specified the theme should include <item name="android:windowTranslucentStatus">true</item>.
+        Setting the layout root to be focusableInTouchMode prevents urlTextBox from stealing focus on launch and opening the keyboard. -->
     <android.support.design.widget.CoordinatorLayout
         android:id="@+id/rootCoordinatorLayout"
         xmlns:android="http://schemas.android.com/apk/res/android"
@@ -64,6 +64,15 @@
         </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/fullScreenVideoFrameLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        android:background="@color/black" />
+
     <!-- The navigation drawer. -->
     <android.support.design.widget.NavigationView
         android:id="@+id/navigationView"
@@ -73,12 +82,4 @@
         app:headerLayout="@layout/navigation_header"
         app:menu="@menu/webview_navigation_menu"
         app:itemIconTint="@color/blue_grey" />
-
-    <!-- fullScreenVideoFrameLayout is used to display full screen videos.  It is initially android:visibility="gone" to hide it from view. -->
-    <FrameLayout
-        android:id="@+id/fullScreenVideoFrameLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        android:background="@color/black" />
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file