Return-Path: X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9F4FEC7A1 for ; Thu, 17 May 2012 03:46:09 +0000 (UTC) Received: (qmail 48349 invoked by uid 500); 17 May 2012 03:46:09 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 48306 invoked by uid 500); 17 May 2012 03:46:08 -0000 Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-commits@incubator.apache.org Received: (qmail 48280 invoked by uid 99); 17 May 2012 03:46:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 May 2012 03:46:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2F842165EB; Thu, 17 May 2012 03:46:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bcurtis@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: android commit: CB-800: Fix preferences for the CordovaWebView. - Test case needed to implement CordovaInterface. Message-Id: <20120517034607.2F842165EB@tyr.zones.apache.org> Date: Thu, 17 May 2012 03:46:06 +0000 (UTC) Updated Branches: refs/heads/CordovaWebView ffa1eb1ee -> f74d8aaf2 CB-800: Fix preferences for the CordovaWebView. - Test case needed to implement CordovaInterface. 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/f74d8aaf Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/f74d8aaf Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/f74d8aaf Branch: refs/heads/CordovaWebView Commit: f74d8aaf2b00a40ac7b855b4bd15eaa19d6ef0eb Parents: ffa1eb1 Author: Bryce Curtis Authored: Wed May 16 22:45:35 2012 -0500 Committer: Bryce Curtis Committed: Wed May 16 22:45:35 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cordova/test/CordovaActivity.java | 2 +- .../cordova/test/CordovaWebViewTestActivity.java | 60 +++++++++++++-- 2 files changed, 55 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/f74d8aaf/test/src/org/apache/cordova/test/CordovaActivity.java ---------------------------------------------------------------------- diff --git a/test/src/org/apache/cordova/test/CordovaActivity.java b/test/src/org/apache/cordova/test/CordovaActivity.java index 0bb3dba..f3a7839 100644 --- a/test/src/org/apache/cordova/test/CordovaActivity.java +++ b/test/src/org/apache/cordova/test/CordovaActivity.java @@ -28,6 +28,6 @@ public class CordovaActivity extends DroidGap { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - super.loadUrl("file:///android_asset/index.html"); + super.loadUrl("file:///android_asset/www/index.html"); } } http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/f74d8aaf/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java ---------------------------------------------------------------------- diff --git a/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java b/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java index 6c5f5c9..2452377 100644 --- a/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java +++ b/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java @@ -20,28 +20,76 @@ package org.apache.cordova.test; import org.apache.cordova.CordovaWebView; +import org.apache.cordova.api.CordovaInterface; +import org.apache.cordova.api.IPlugin; import android.app.Activity; +import android.content.Intent; import android.os.Bundle; +import android.util.Log; + +public class CordovaWebViewTestActivity extends Activity implements CordovaInterface { -public class CordovaWebViewTestActivity extends Activity { - CordovaWebView phoneGap; + /** Called when the activity is first created. */ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setContentView(R.layout.main); - + phoneGap = (CordovaWebView) findViewById(R.id.phoneGapView); - + phoneGap.loadUrl("file:///android_asset/www/index.html"); - + } - + public void onDestroy() { super.onDestroy(); //phoneGap.onDestroy(); } + + @Override + public void startActivityForResult(IPlugin command, Intent intent, int requestCode) { + // TODO Auto-generated method stub + + } + + @Override + public void setActivityResultCallback(IPlugin plugin) { + // TODO Auto-generated method stub + + } + + @Override + public void bindBackButton(boolean override) { + // TODO Auto-generated method stub + + } + + @Override + public boolean isBackButtonBound() { + // TODO Auto-generated method stub + return false; + } + + @Override + public Activity getActivity() { + // TODO Auto-generated method stub + return this; + } + + @Override + public void cancelLoadUrl() { + // TODO Auto-generated method stub + + } + + @Override + public Object onMessage(String id, Object data) { + // TODO Auto-generated method stub + return null; + } } \ No newline at end of file