You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2015/04/09 04:01:52 UTC

[1/2] android commit: CB-8829 Set targetSdk to 22

Repository: cordova-android
Updated Branches:
  refs/heads/master 0f73884c8 -> a0293578b


CB-8829 Set targetSdk to 22


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

Branch: refs/heads/master
Commit: a0293578b1a6bd4241ba2fa0d6b13cc4e6c4096e
Parents: 4595403
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Apr 8 21:28:11 2015 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Apr 8 21:34:15 2015 -0400

----------------------------------------------------------------------
 framework/project.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a0293578/framework/project.properties
----------------------------------------------------------------------
diff --git a/framework/project.properties b/framework/project.properties
index 57bcb9a..40ae82c 100644
--- a/framework/project.properties
+++ b/framework/project.properties
@@ -10,7 +10,7 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-21
+target=android-22
 apk-configurations=
 renderscript.opt.level=O0
 android.library=true


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[2/2] android commit: CB-8828 Delete onScrollChanged event

Posted by ag...@apache.org.
CB-8828 Delete onScrollChanged event


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

Branch: refs/heads/master
Commit: 4595403a99fe02d808cf1bf34fce465961ddbd93
Parents: 0f73884
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Apr 8 21:24:36 2015 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Apr 8 21:34:15 2015 -0400

----------------------------------------------------------------------
 RELEASENOTES.md                                 |  7 ++-
 .../src/org/apache/cordova/CordovaActivity.java |  4 --
 .../src/org/apache/cordova/ScrollEvent.java     | 65 --------------------
 .../apache/cordova/engine/SystemWebView.java    | 13 ----
 4 files changed, 5 insertions(+), 84 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/4595403a/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index be5f75d..5dafc87 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -48,12 +48,15 @@ Changes For Plugin Developers:
   * Android Studio is now fully supported, and recommended over Eclipse
 * Build using Gradle
   * All builds [use Gradle by default](Android%20Shell%20Tool%20Guide_building_with_gradle), instead of Ant
+  * Plugins can add their own gradle build steps!
+  * Plugins can depend on Maven libraries using `<framework>` tags
+* New APIs: `onStart`, `onStop`, `onConfigurationChanged`
+* `"onScrollChanged"` message removed. Use `view.getViewTreeObserver().addOnScrollChangedListener(...)` instead
+* CB-8702 New API for plugins to override `shouldInterceptRequest` with a stream
 
 #### Other Changes ####
 * CB-8378 Removed `hidekeyboard` and `showkeyboard` events (apps should use a plugin instead)
-* CB-7085 Add `onConfigurationChanged` hook for plugins
 * CB-8735 `bin/create` regex relaxed / better support for numbers
-* CB-8702 Add API for plugins to override `shouldInterceptRequest` with a stream
 * CB-8699 Fix CordovaResourceApi `copyResource` creating zero-length files when src=uncompressed asset
 * CB-8693 CordovaLib should not contain icons / splashscreens
 * CB-8592 Fix NPE if lifecycle events reach CordovaWebView before `init()` has been called

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/4595403a/framework/src/org/apache/cordova/CordovaActivity.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
index 45254b3..bf86c05 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -421,10 +421,6 @@ public class CordovaActivity extends Activity {
      * @return              Object or null
      */
     public Object onMessage(String id, Object data) {
-        if (!"onScrollChanged".equals(id)) {
-            LOG.d(TAG, "onMessage(" + id + "," + data + ")");
-        }
-
         if ("onReceivedError".equals(id)) {
             JSONObject d = (JSONObject) data;
             try {

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/4595403a/framework/src/org/apache/cordova/ScrollEvent.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/ScrollEvent.java b/framework/src/org/apache/cordova/ScrollEvent.java
deleted file mode 100644
index 4e31ca7..0000000
--- a/framework/src/org/apache/cordova/ScrollEvent.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-package org.apache.cordova;
-
-import android.view.View;
-
-/*
- * @deprecated As of release 4.0. Use view.getViewTreeObserver().addOnScrollChangedListener(...) instead.
- */
-@Deprecated
-public class ScrollEvent {
-    
-    public int l, t, nl, nt;
-    private View targetView;
-    
-    /*
-     * ScrollEvent constructor
-     * No idea why it uses l and t instead of x and y
-     * 
-     * @param x
-     * @param y
-     * @param nx
-     * @param ny
-     * @param view
-     */
-    
-    public ScrollEvent(int nx, int ny, int x, int y, View view)
-    {
-        l = x; y = t; nl = nx; nt = ny;
-        targetView = view;
-    }
-    
-    public int dl()
-    {
-        return nl - l;
-    }
-    
-    public int dt()
-    {
-        return nt - t;
-    }
-    
-    public View getTargetView()
-    {
-        return targetView;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/4595403a/framework/src/org/apache/cordova/engine/SystemWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/engine/SystemWebView.java b/framework/src/org/apache/cordova/engine/SystemWebView.java
index 66ce846..e3cee30 100644
--- a/framework/src/org/apache/cordova/engine/SystemWebView.java
+++ b/framework/src/org/apache/cordova/engine/SystemWebView.java
@@ -10,7 +10,6 @@ import android.webkit.WebViewClient;
 import org.apache.cordova.CordovaInterface;
 import org.apache.cordova.CordovaWebView;
 import org.apache.cordova.CordovaWebViewEngine;
-import org.apache.cordova.ScrollEvent;
 
 /**
  * Custom WebView subclass that enables us to capture events needed for Cordova.
@@ -60,18 +59,6 @@ public class SystemWebView extends WebView implements CordovaWebViewEngine.Engin
     }
 
     @Override
-    public void onScrollChanged(int l, int t, int oldl, int oldt)
-    {
-        // TODO: scrolling is perf-sensitive, so we'd be better to not use postMessage
-        // here, and also not create any new objects. Instead, plugins should use:
-        //     webView.getView().getViewTreeObserver().addOnScrollChangedListener(...)
-        if (parentEngine != null && parentEngine.pluginManager != null) {
-            ScrollEvent myEvent = new ScrollEvent(l, t, oldl, oldt, this);
-            parentEngine.pluginManager.postMessage("onScrollChanged", myEvent);
-        }
-    }
-
-    @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
         Boolean ret = parentEngine.client.onDispatchKeyEvent(event);
         if (ret != null) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org