incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [1/4] android commit: After failed rebase, need to do merge in the branch to fix this
Date Thu, 21 Jun 2012 22:21:26 GMT
Updated Branches:
  refs/heads/master 5ca4b4a88 -> 1d458f278


After failed rebase, need to do merge in the branch to fix this


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/1d458f27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/1d458f27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/1d458f27

Branch: refs/heads/master
Commit: 1d458f2782044fbd57c6ed3359e42ddd63815318
Parents: ccf0c5d 5ca4b4a
Author: Joe Bowser <bowserj@apache.org>
Authored: Thu Jun 21 14:49:19 2012 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Thu Jun 21 14:49:19 2012 -0700

----------------------------------------------------------------------
 bin/create                                         |   10 +
 bin/create.js                                      |    1 +
 .../cordova/ApplicationInfo/ApplicationInfo.class  |  Bin 0 -> 1941 bytes
 .../cordova/ApplicationInfo/ApplicationInfo.java   |   44 +++
 bin/templates/cordova/ApplicationInfo/manifest.txt |    1 +
 bin/templates/cordova/BOOM                         |    7 +
 bin/templates/cordova/appinfo.jar                  |  Bin 0 -> 1527 bytes
 bin/templates/cordova/clean                        |    7 +
 bin/templates/cordova/cordova                      |   91 ++++++
 bin/templates/cordova/debug                        |    7 +
 bin/templates/cordova/emulate                      |    7 +
 bin/templates/cordova/log                          |    7 +
 bin/templates/project/assets/www/index.html        |    2 +-
 bin/tests/test_create_unix.js                      |   35 +++
 bin/tests/test_create_win.js                       |  108 ++++++++
 framework/assets/js/cordova.android.js             |   83 +++----
 framework/assets/www/index.html                    |    2 +-
 .../src/org/apache/cordova/AccelListener.java      |    8 +-
 framework/src/org/apache/cordova/App.java          |    6 +-
 framework/src/org/apache/cordova/AudioHandler.java |    4 +-
 framework/src/org/apache/cordova/AudioPlayer.java  |    6 +-
 .../src/org/apache/cordova/BatteryListener.java    |    4 +-
 .../src/org/apache/cordova/CameraLauncher.java     |  213 +++++++++++----
 framework/src/org/apache/cordova/Capture.java      |   99 +++++--
 .../src/org/apache/cordova/CompassListener.java    |    8 +-
 .../src/org/apache/cordova/ContactManager.java     |    2 +-
 .../org/apache/cordova/CordovaChromeClient.java    |   18 +-
 .../src/org/apache/cordova/CordovaWebView.java     |   44 ++--
 .../org/apache/cordova/CordovaWebViewClient.java   |   77 +++++-
 framework/src/org/apache/cordova/Device.java       |   16 +-
 framework/src/org/apache/cordova/DroidGap.java     |   72 +++---
 framework/src/org/apache/cordova/FileTransfer.java |    2 +-
 framework/src/org/apache/cordova/FileUtils.java    |   30 +-
 framework/src/org/apache/cordova/GeoBroker.java    |    2 +-
 .../src/org/apache/cordova/NetworkManager.java     |   12 +-
 framework/src/org/apache/cordova/Notification.java |   28 +-
 framework/src/org/apache/cordova/SplashScreen.java |    3 +-
 framework/src/org/apache/cordova/Storage.java      |    2 +-
 framework/src/org/apache/cordova/TempListener.java |    8 +-
 .../org/apache/cordova/api/CordovaInterface.java   |    2 +
 framework/src/org/apache/cordova/api/Plugin.java   |    4 +-
 41 files changed, 796 insertions(+), 286 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/1d458f27/framework/src/org/apache/cordova/App.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/1d458f27/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/CordovaWebView.java
index f5dec85,3337be2..f9edbbe
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@@ -52,15 -51,11 +52,15 @@@ public class CordovaWebView extends Web
      /** The whitelist **/
      private ArrayList<Pattern> whiteList = new ArrayList<Pattern>();
      private HashMap<String, Boolean> whiteListCache = new HashMap<String, Boolean>();
 +    private ArrayList<Integer> keyDownCodes = new ArrayList<Integer>();
 +    private ArrayList<Integer> keyUpCodes = new ArrayList<Integer>();
 +    
      public PluginManager pluginManager;
      public CallbackServer callbackServer;
 +    
  
      /** Actvities and other important classes **/
-     private CordovaInterface mCtx;
+     private CordovaInterface cordova;
      CordovaWebViewClient viewClient;
      @SuppressWarnings("unused")
      private CordovaChromeClient chromeClient;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/1d458f27/framework/src/org/apache/cordova/DroidGap.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/DroidGap.java
index f0f31f1,a5e2a7d..8b26f37
--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@@ -784,9 -784,89 +784,9 @@@ public class DroidGap extends Activity 
          super.finish();
      }
  
 -    /**
 -     * Called when a key is released. (Key UP)
 -     *
 -     * @param keyCode
 -     * @param event
 -     */
 -    @Override
 -    public boolean onKeyUp(int keyCode, KeyEvent event) {
 -        if (this.appView == null) {
 -            return super.onKeyUp(keyCode, event);
 -        }
 -
 -        // If back key
 -        if (keyCode == KeyEvent.KEYCODE_BACK) {
 -            // If back key is bound, then send event to JavaScript
 -            if (this.bound) {
 -                this.appView.loadUrl("javascript:cordova.fireDocumentEvent('backbutton');");
 -                return true;
 -            } else {
 -                // If not bound
 -                // Go to previous page in webview if it is possible to go back
 -                if (this.backHistory()) {
 -                    return true;
 -                }
 -                // If not, then invoke behavior of super class
 -                else {
 -                    this.activityState = ACTIVITY_EXITING;
 -                    return super.onKeyUp(keyCode, event);
 -                }
 -            }
 -        }
 -
 -        // If menu key
 -        else if (keyCode == KeyEvent.KEYCODE_MENU) {
 -            this.appView.loadUrl("javascript:cordova.fireDocumentEvent('menubutton');");
 -            return super.onKeyUp(keyCode, event);
 -        }
 -
 -        // If search key
 -        else if (keyCode == KeyEvent.KEYCODE_SEARCH) {
 -            this.appView.loadUrl("javascript:cordova.fireDocumentEvent('searchbutton');");
 -            return true;
 -        }
 -
 -        return false;
 -    }
 -
 -    /**
 -    * Called when a key is pressed. (Key DOWN)
 -     *
 -     * @param keyCode
 -     * @param event
 -     */
 -    @Override
 -    public boolean onKeyDown(int keyCode, KeyEvent event) {
 -        if (this.appView == null) {
 -            return super.onKeyDown(keyCode, event);
 -        }
 -
 -        // If volumedown key
 -        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
 -            if (this.volumedownBound==true) {
 -                // only override default behaviour is event bound
 -                LOG.d(TAG, "Down Key Hit");
 -                this.appView.loadUrl("javascript:cordova.fireDocumentEvent('volumedownbutton');");
 -                return true;
 -            }
 -        }
 -
 -        // If volumeup key
 -        else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
 -            if (this.volumeupBound==true) {
 -                // only override default behaviour is event bound
 -                LOG.d(TAG, "Up Key Hit");
 -                this.appView.loadUrl("javascript:cordova.fireDocumentEvent('volumeupbutton');");
 -                return true;
 -            }
 -        }
 -        return super.onKeyDown(keyCode, event);
 -    }
 -
 +    
      /**
-      * 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


Mime
View raw message