incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [49/50] [abbrv] android commit: Updates.
Date Thu, 07 Jun 2012 20:20:55 GMT
Updates.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/e6aa6476
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/e6aa6476
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/e6aa6476

Branch: refs/heads/master
Commit: e6aa64760e2cb6f289c6ba7fed0df0e26a86d7fe
Parents: 3829df6
Author: Bryce Curtis <curtis.bryce@gmail.com>
Authored: Mon May 14 22:18:01 2012 -0500
Committer: Bryce Curtis <curtis.bryce@gmail.com>
Committed: Mon May 14 22:18:01 2012 -0500

----------------------------------------------------------------------
 framework/src/org/apache/cordova/DroidGap.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e6aa6476/framework/src/org/apache/cordova/DroidGap.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java
index a1c3adb..842895d 100755
--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@ -251,8 +251,14 @@ public class DroidGap extends Activity implements CordovaInterface {
 
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);
 
+        // TODO @bc - What about fullscreen?
+        //if (preferences.prefMatches("fullscreen", "true")) {
+        //    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();
@@ -400,6 +406,7 @@ public class DroidGap extends Activity implements CordovaInterface {
      * Cancel loadUrl before it has been loaded.
      */
     // TODO NO-OP
+    @Deprecated
     public void cancelLoadUrl() {
         this.cancelLoadUrl = true;
     }
@@ -639,9 +646,7 @@ public class DroidGap extends Activity implements CordovaInterface {
             }
 
             // Resume JavaScript timers (including setInterval)
-            if (this.appView.pluginManager != null) {
-                this.appView.resumeTimers();
-            }
+            this.appView.resumeTimers();
         }
     }
 


Mime
View raw message