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 8B9EA9B44 for ; Wed, 25 Jan 2012 19:44:27 +0000 (UTC) Received: (qmail 41024 invoked by uid 500); 25 Jan 2012 19:44:27 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 41005 invoked by uid 500); 25 Jan 2012 19:44:27 -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 40998 invoked by uid 99); 25 Jan 2012 19:44:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jan 2012 19:44:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,NORMAL_HTTP_TO_IP X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jan 2012 19:44:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 21DF53199AC; Wed, 25 Jan 2012 19:44:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android Message-Id: <20120125194403.21DF53199AC@tyr.zones.apache.org> Date: Wed, 25 Jan 2012 19:44:03 +0000 (UTC) Updated Branches: refs/heads/master e1e04f859 -> 9206dca74 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android 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/9206dca7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/9206dca7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/9206dca7 Branch: refs/heads/master Commit: 9206dca741b35072400572515ceeb3ff06645005 Parents: 503640f e1e04f8 Author: Joe Bowser Authored: Wed Jan 25 11:41:24 2012 -0800 Committer: Joe Bowser Committed: Wed Jan 25 11:41:24 2012 -0800 ---------------------------------------------------------------------- README.md | 10 ++++ framework/libs/junit-4.10.jar | Bin 253160 -> 0 bytes framework/res/xml/phonegap.xml | 15 ++++++- framework/res/xml/plugins.xml | 1 - .../src/com/phonegap/CordovaChromeClient.java | 22 +++++++++- .../src/com/phonegap/CordovaWebViewClient.java | 21 +++++++++ framework/src/com/phonegap/FileTransfer.java | 3 +- framework/src/com/phonegap/KeyboardHandler.java | 33 --------------- .../phonegap/LinearLayoutSoftKeyboardDetect.java | 22 +++++++++- 9 files changed, 88 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9206dca7/framework/res/xml/phonegap.xml ---------------------------------------------------------------------- diff --cc framework/res/xml/phonegap.xml index ad6f329,69e4876..29476c2 --- a/framework/res/xml/phonegap.xml +++ b/framework/res/xml/phonegap.xml @@@ -1,6 -1,19 +1,19 @@@ - + + + + + + + + - + + + +