Weird comment conflict

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

@@ -160,7 +160,7 @@ public class DroidGap extends Activity implements CordovaInterface {
     protected IPlugin activityResultCallback = null;
     protected boolean activityResultKeepRunning;
 
-    // Default background color for activity 
+    // Default background color for activity
     // (this is not the color for the webview, which is set in HTML)
     private int backgroundColor = Color.BLACK;
 
@@ -187,7 +187,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
     * Sets the authentication token.
-    * 
+    *
     * @param authenticationToken
     * @param host
     * @param realm
@@ -203,7 +203,7 @@ public class DroidGap extends Activity implements CordovaInterface {
      *
      * @param host
      * @param realm
-     * 
+     *
      * @return the authentication token or null if did not exist
      */
     public AuthenticationToken removeAuthenticationToken(String host, String realm) {
@@ -224,7 +224,7 @@ public class DroidGap extends Activity implements CordovaInterface {
      *
      * @param host
      * @param realm
-     * 
+     *
      * @return the authentication token
      */
     public AuthenticationToken getAuthenticationToken(String host, String realm) {
@@ -243,9 +243,9 @@ public class DroidGap extends Activity implements CordovaInterface {
         }
     }
 
-    /** 
+    /**
-     * Called when the activity is first created. 
+     * Called when the activity is first created.
-     * 
+     *
      * @param savedInstanceState
      */
     @SuppressWarnings("deprecation")
@@ -277,7 +277,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Get the Android activity.
-     * 
+     *
      * @return
      */
     public Activity getActivity() {
@@ -327,7 +327,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Load the url into the webview.
-     * 
+     *
      * @param url
      */
     public void loadUrl(String url) {
@@ -775,7 +775,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Called when a key is released. (Key UP)
-     * 
+     *
      * @param keyCode
      * @param event
      */
@@ -898,12 +898,12 @@ public class DroidGap extends Activity implements CordovaInterface {
     }
 
     /**
-     * Report an error to the host application. These errors are unrecoverable (i.e. the main resource is unavailable). 
+     * Report an error to the host application. These errors are unrecoverable (i.e. the main resource is unavailable).
      * The errorCode parameter corresponds to one of the ERROR_* constants.
      *
      * @param errorCode    The error code corresponding to an ERROR_* value.
      * @param description  A String describing the error.
-     * @param failingUrl   The url that failed to load. 
+     * @param failingUrl   The url that failed to load.
      */
     public void onReceivedError(final int errorCode, final String description, final String failingUrl) {
         final DroidGap me = this;
@@ -939,7 +939,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Display an error dialog and optionally exit application.
-     * 
+     *
      * @param title
      * @param message
      * @param button
@@ -986,7 +986,7 @@ public class DroidGap extends Activity implements CordovaInterface {
         return false;
     }
 
-    /* 
+    /*
      * Hook in DroidGap for menu plugins
      *
      */
@@ -1010,7 +1010,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Get Activity context.
-     * 
+     *
      * @return
      */
     public Context getContext() {
@@ -1019,7 +1019,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Override the backbutton.
-     * 
+     *
      * @param override
      */
     public void bindBackButton(boolean override) {
@@ -1028,7 +1028,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Determine of backbutton is overridden.
-     * 
+     *
      * @return
      */
     public boolean isBackButtonBound() {
@@ -1037,7 +1037,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Load the specified URL in the Cordova webview or a new browser instance.
-     * 
+     *
      * NOTE: If openExternal is false, only URLs listed in whitelist can be loaded.
      *
      * @param url           The url to load.
@@ -1094,6 +1094,12 @@ public class DroidGap extends Activity implements CordovaInterface {
 
         // Create and show the dialog
         splashDialog = new Dialog(this, android.R.style.Theme_Translucent_NoTitleBar);
+        // check to see if the splash screen should be full screen
+        if ((getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_FULLSCREEN)
+                == WindowManager.LayoutParams.FLAG_FULLSCREEN) {
+            splashDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                    WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        }
         splashDialog.setContentView(root);
         splashDialog.setCancelable(false);
         splashDialog.show();
@@ -1108,8 +1114,8 @@ public class DroidGap extends Activity implements CordovaInterface {
     }
 
     /**
-     * Called when a message is sent to plugin. 
+     * Called when a message is sent to plugin.
-     * 
+     *
      * @param id            The message id
      * @param data          The message data
      * @return              Object or null

framework/src/org/apache/cordova/api/CordovaInterface.java

@@ -28,9 +28,9 @@ import android.content.Intent;
 public interface CordovaInterface {
 
     /**
-     * Launch an activity for which you would like a result when it finished. When this activity exits, 
+     * Launch an activity for which you would like a result when it finished. When this activity exits,
      * your onActivityResult() method will be called.
-     *  
+     *
      * @param command     The command object
      * @param intent      The intent to start
      * @param requestCode   The request code that is passed to callback to identify the activity
@@ -39,28 +39,28 @@ public interface CordovaInterface {
 
     /**
      * Set the plugin to be called when a sub-activity exits.
-     * 
+     *
      * @param plugin      The plugin on which onActivityResult is to be called
      */
     abstract public void setActivityResultCallback(IPlugin plugin);
 
     /**
      * Causes the Activity to override the back button behavior.
-     * 
+     *
      * @param override
      */
     public abstract void bindBackButton(boolean override);
 
     /**
      * A hook required to check if the Back Button is bound.
-     * 
+     *
      * @return
      */
     public abstract boolean isBackButtonBound();
 
     /**
      * Get the Android activity.
-     * 
+     *
      * @return
      */
     public abstract Activity getActivity();
@@ -69,12 +69,11 @@ public interface CordovaInterface {
     public abstract void cancelLoadUrl();
 
     /**
-     * Called when a message is sent to plugin. 
+     * Called when a message is sent to plugin.
-     * 
+     *
      * @param id            The message id
      * @param data          The message data
      * @return              Object or null
      */
     public Object onMessage(String id, Object data);
-
 }