Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 58AA210537 for ; Wed, 30 Apr 2014 22:03:04 +0000 (UTC) Received: (qmail 78784 invoked by uid 500); 30 Apr 2014 22:02:54 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 78525 invoked by uid 500); 30 Apr 2014 22:02:48 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 78449 invoked by uid 99); 30 Apr 2014 22:02:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Apr 2014 22:02:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0238A88AB0C; Wed, 30 Apr 2014 22:02:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: commits@cordova.apache.org Date: Wed, 30 Apr 2014 22:02:56 -0000 Message-Id: <43bd40eb262344b3848e44a7b9928470@git.apache.org> In-Reply-To: <748531b7e41147a6b0e4d8a2efdb36bb@git.apache.org> References: <748531b7e41147a6b0e4d8a2efdb36bb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/18] android commit: Merge pull request #2 from huningxin/pluggable_webview Merge pull request #2 from huningxin/pluggable_webview Pluggable webview Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/a09255b2 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/a09255b2 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/a09255b2 Branch: refs/heads/pluggable_webview Commit: a09255b2ff1d2fb20f1bc5b3393fb2449e7f197d Parents: 79e313a 9d1c72c Author: Joe Bowser Authored: Tue Apr 22 15:55:52 2014 -0700 Committer: Joe Bowser Committed: Tue Apr 22 15:55:52 2014 -0700 ---------------------------------------------------------------------- bin/templates/project/AndroidManifest.xml | 2 ++ framework/src/org/apache/cordova/AndroidWebView.java | 4 ++++ framework/src/org/apache/cordova/CordovaActivity.java | 2 +- framework/src/org/apache/cordova/CordovaWebView.java | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) ----------------------------------------------------------------------