Merge pull request #161 from fujunwei/immersive-mode

Add a preference to disable immersive mode

Author: huningxin

framework/src/org/apache/cordova/CordovaActivity.java

@@ -228,7 +228,7 @@ public void onCreate(Bundle savedInstanceState) {
         } else if (preferences.getBoolean("Fullscreen", false)) {
             toggleFullscreen(getWindow());
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            if (isImmersiveMode()) {
                 getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
                     @Override
                     public void onSystemUiVisibilityChange(int visibility) {
@@ -315,14 +315,19 @@ protected void createViews() {
      */
     @SuppressLint("NewApi")
     private void toggleFullscreen(Window window) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+        if (isImmersiveMode()) {
             setSystemUiVisibilityMode(window);
         } else {
             window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                     WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
     }
 
+    private boolean isImmersiveMode() {
+        return !preferences.getBoolean("disableImmersive", false) &&
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+    }
+
     private void setSystemUiVisibilityMode(Window window) {
         final int uiOptions =
                     View.SYSTEM_UI_FLAG_LAYOUT_STABLE
@@ -1042,7 +1047,7 @@ public void run() {
                 {
                     toggleFullscreen(splashDialog.getWindow());
 
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                    if (isImmersiveMode()) {
                         splashDialog.getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
                             @Override
                             public void onSystemUiVisibilityChange(int visibility) {