From 663a71255ff0e3a7a3d31bda4cd72fa7b4de1283 Mon Sep 17 00:00:00 2001
From: Andrew Grieve <agrieve@chromium.org>
Date: Fri, 4 Jul 2014 12:11:19 -0400
Subject: [PATCH] Move handling of Fullscreen preference to CordovaActivity

Makes more sense here since that's where the other FullScreen related
changes are.
---
 .../org/apache/cordova/CordovaActivity.java   |  8 +++++---
 .../org/apache/cordova/CordovaWebView.java    | 20 -------------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
index 18ac670f..89d4c81f 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -213,12 +213,14 @@ public class CordovaActivity extends Activity implements CordovaInterface {
             Log.d(TAG, "The SetFullscreen configuration is deprecated in favor of Fullscreen, and will be removed in a future version.");
             getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                     WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        }
-        else
-        {
+        } else if (this.getBooleanProperty("Fullscreen", false)) {
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                    WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        } else {
             getWindow().setFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN,
                     WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
         }
+
         // This builds the view.  We could probably get away with NOT having a LinearLayout, but I like having a bucket!
         Display display = getWindowManager().getDefaultDisplay();
         int width = display.getWidth();
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index ad5c0f0e..9401e03b 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -49,7 +49,6 @@ import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.webkit.WebBackForwardList;
 import android.webkit.WebHistoryItem;
@@ -138,7 +137,6 @@ public class CordovaWebView extends WebView {
         {
             Log.d(TAG, "Your activity must implement CordovaInterface to work");
         }
-        this.loadConfiguration();
         this.setup();
     }
 
@@ -160,7 +158,6 @@ public class CordovaWebView extends WebView {
         }
         this.setWebChromeClient(new CordovaChromeClient(this.cordova, this));
         this.initWebViewClient(this.cordova);
-        this.loadConfiguration();
         this.setup();
     }
 
@@ -183,7 +180,6 @@ public class CordovaWebView extends WebView {
             Log.d(TAG, "Your activity must implement CordovaInterface to work");
         }
         this.setWebChromeClient(new CordovaChromeClient(this.cordova, this));
-        this.loadConfiguration();
         this.setup();
     }
 
@@ -208,7 +204,6 @@ public class CordovaWebView extends WebView {
         }
         this.setWebChromeClient(new CordovaChromeClient(this.cordova));
         this.initWebViewClient(this.cordova);
-        this.loadConfiguration();
         this.setup();
     }
 
@@ -654,21 +649,6 @@ public class CordovaWebView extends WebView {
         }
     }
 
-    /**
-     * Check configuration parameters from Config.
-     * Approved list of URLs that can be loaded into Cordova
-     *      <access origin="http://server regexp" subdomains="true" />
-     * Log level: ERROR, WARN, INFO, DEBUG, VERBOSE (default=ERROR)
-     *      <log level="DEBUG" />
-     */
-    private void loadConfiguration() {
- 
-        if ("true".equals(this.getProperty("Fullscreen", "false"))) {
-            this.cordova.getActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
-            this.cordova.getActivity().getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        }
-    }
-
     /**
      * Get string property for activity.
      *