github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-31 17:32:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Weird comment conflict

Browse Source
This commit is contained in:
Joe Bowser 2012-06-11 10:28:24 -07:00
commit 9ebdca66d9
2 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/src/org/apache/cordova/DroidGap.java
View File

@ -1094,6 +1094,12 @@ public class DroidGap extends Activity implements CordovaInterface {
// Create and show the dialog // Create and show the dialog
splashDialog = new Dialog(this, android.R.style.Theme_Translucent_NoTitleBar); 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.setContentView(root);
splashDialog.setCancelable(false); splashDialog.setCancelable(false);
splashDialog.show(); splashDialog.show();

1
framework/src/org/apache/cordova/api/CordovaInterface.java
View File

@ -76,5 +76,4 @@ public interface CordovaInterface {
* @return Object or null * @return Object or null
*/ */
public Object onMessage(String id, Object data); public Object onMessage(String id, Object data);
} }