Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView
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/9dfa503b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/9dfa503b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/9dfa503b Branch: refs/heads/CordovaWebView Commit: 9dfa503badd3ac9ac06f01fe1670a0367c9029e2 Parents: 5abe8dd a087116 Author: Joe Bowser <bows...@apache.org> Authored: Mon May 7 11:15:38 2012 -0700 Committer: Joe Bowser <bows...@apache.org> Committed: Mon May 7 11:15:38 2012 -0700 ---------------------------------------------------------------------- .gitignore | 1 + bin/BOOM | 19 ++++- bin/bench | 18 ++++ bin/create | 16 +++ bin/create.js | 21 ++++- bin/create.xml | 21 ++++- bin/templates/project/cordova/create | 17 +++ bin/templates/project/cordova/debug | 18 ++++ bin/templates/project/cordova/emulate | 21 ++++- bin/templates/project/cordova/log | 18 ++++ .../project/cordova/templates/Activity.java | 19 ++++ .../cordova/templates/project/AndroidManifest.xml | 18 ++++ bin/test | 18 ++++ framework/src/org/apache/cordova/SplashScreen.java | 19 ++++ test/AndroidManifest.xml | 18 ++++ test/assets/www/backbuttonmultipage/index.html | 20 ++++- test/assets/www/backbuttonmultipage/sample2.html | 20 ++++- test/assets/www/backbuttonmultipage/sample3.html | 18 ++++ test/assets/www/background/index.html | 18 ++++ test/assets/www/background/index2.html | 18 ++++ test/assets/www/cordova.js | 23 ++++- test/assets/www/htmlnotfound/error.html | 20 ++++- test/assets/www/iframe/index.html | 18 ++++ test/assets/www/iframe/index2.html | 18 ++++ test/assets/www/index.html | 40 ++++++-- test/assets/www/jqmtabbackbutton/index.html | 20 ++++- test/assets/www/jqmtabbackbutton/tab1.html | 20 ++++- test/assets/www/jqmtabbackbutton/tab2.html | 20 ++++- test/assets/www/jqmtabbackbutton/tab3.html | 20 ++++- test/assets/www/lifecycle/index.html | 18 ++++ test/assets/www/lifecycle/index2.html | 18 ++++ test/assets/www/main.js | 19 ++++ test/assets/www/master.css | 79 +++++++++------ test/assets/www/menus/index.html | 18 ++++ test/assets/www/splashscreen/index.html | 18 ++++ test/assets/www/userwebview/index.html | 18 ++++ test/assets/www/whitelist/index.html | 18 ++++ test/assets/www/whitelist/index2.html | 18 ++++ test/assets/www/xhr/index.html | 18 ++++ test/build.xml | 18 ++++ test/res/layout/main.xml | 18 ++++ test/res/xml/cordova.xml | 18 ++++ 42 files changed, 797 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9dfa503b/test/AndroidManifest.xml ---------------------------------------------------------------------- diff --cc test/AndroidManifest.xml index 3bcc23d,21a8d8f..5772c3e mode 100644,100755..100644 --- a/test/AndroidManifest.xml +++ b/test/AndroidManifest.xml http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9dfa503b/test/res/layout/main.xml ---------------------------------------------------------------------- diff --cc test/res/layout/main.xml index e08013a,721cf4e..45e2d06 mode 100644,100755..100644 --- a/test/res/layout/main.xml +++ b/test/res/layout/main.xml @@@ -1,13 -1,31 +1,31 @@@ <?xml version="1.0" encoding="utf-8"?> + <!-- + 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. + --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"; - android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" - > -<TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="Hello World, tests" - /> -</LinearLayout> + android:orientation="vertical" > + + <org.apache.cordova.CordovaWebView + android:id="@+id/phoneGapView" + android:layout_width="fill_parent" + android:layout_height="fill_parent" /> + +</LinearLayout>
