You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2012/06/13 01:11:23 UTC

[11/18] android commit: removing old create and templates

removing old create and templates


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/447af8da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/447af8da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/447af8da

Branch: refs/heads/master
Commit: 447af8da6a1bac5d03a1f82aaf029546edec70db
Parents: e8b80e8
Author: Anis Kadri <an...@gmail.com>
Authored: Thu Jun 7 20:08:22 2012 -0700
Committer: Anis Kadri <an...@gmail.com>
Committed: Thu Jun 7 20:08:22 2012 -0700

----------------------------------------------------------------------
 bin/create                                         |   74 -------
 bin/templates/project/.cordova/android/readme.md   |    1 -
 bin/templates/project/.cordova/readme.md           |    3 -
 bin/templates/project/cordova/create               |   58 -----
 bin/templates/project/cordova/create.bat           |    2 -
 bin/templates/project/cordova/create.js            |   69 ------
 bin/templates/project/cordova/debug                |   27 ---
 bin/templates/project/cordova/emulate              |   31 ---
 bin/templates/project/cordova/log                  |   21 --
 .../project/cordova/templates/Activity.java        |   35 ---
 .../cordova/templates/project/AndroidManifest.xml  |   61 ------
 .../templates/project/assets/www/index.html        |   60 ------
 .../cordova/templates/project/assets/www/main.js   |  165 ---------------
 .../templates/project/assets/www/master.css        |  116 ----------
 .../templates/project/res/drawable-hdpi/icon.png   |  Bin 6080 -> 0 bytes
 .../templates/project/res/drawable-ldpi/icon.png   |  Bin 3096 -> 0 bytes
 .../templates/project/res/drawable-mdpi/icon.png   |  Bin 4090 -> 0 bytes
 .../templates/project/res/drawable-xhdpi/icon.png  |  Bin 7685 -> 0 bytes
 .../templates/project/res/drawable/icon.png        |  Bin 7685 -> 0 bytes
 19 files changed, 0 insertions(+), 723 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/create
----------------------------------------------------------------------
diff --git a/bin/create b/bin/create
deleted file mode 100755
index 736fa14..0000000
--- a/bin/create
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-#       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.
-#
-# create a cordova/android project
-# 
-# USAGE
-#   ./create [path package activity]
-#
-set -e
-
-PROJECT_PATH=${1:-"./example"}
-PACKAGE=${2:-"org.apache.cordova.example"}
-ACTIVITY=${3:-"cordovaExample"}
-TARGET=$(android list targets | grep 'id: ' | sed 's/id: \([0-9]*\).*/\1/g' | tail -1)
-VERSION=$(cat ./VERSION)
-
-# clobber any existing example
-if [ $# -eq 0 ]
-then
-    rm -rf $PROJECT_PATH
-fi
-
-# update the cordova-android framework for the desired target
-android update project --target $TARGET --path ./framework
-
-if [ ! -e ./framework/libs/commons-codec-1.6.jar ]; then
-    # Use curl to get the jar (TODO: Support Apache Mirrors)
-    curl -OL http://mirror.symnds.com/software/Apache//commons/codec/binaries/commons-codec-1.6-bin.zip
-    unzip commons-codec-1.6-bin.zip
-    mkdir -p ./framework/libs
-    cp commons-codec-1.6/commons-codec-1.6.jar ./framework/libs/
-fi
-
-# compile cordova.js and cordova.jar
-cd ./framework && ant jar && cd ../
-
-# copy all the bin scripts etc in there
-cp -R ./bin/templates/project/ $PROJECT_PATH
-
-# copy in cordova.js
-cp ./framework/assets/www/cordova-$VERSION.js $PROJECT_PATH/.cordova/android/cordova-$VERSION.js
-
-# copy in cordova.jar
-cp ./framework/cordova-$VERSION.jar $PROJECT_PATH/.cordova/android/cordova-$VERSION.jar
-
-# copy in res/xml
-cp ./framework/res/xml/cordova.xml $PROJECT_PATH/.cordova/android/cordova.xml
-cp ./framework/res/xml/plugins.xml $PROJECT_PATH/.cordova/android/plugins.xml
-
-# app properties
-cat > $PROJECT_PATH/.cordova/config <<eom
-VERSION=$VERSION
-PROJECT_PATH=$PROJECT_PATH
-PACKAGE=$PACKAGE
-ACTIVITY=$ACTIVITY
-TARGET=$TARGET
-eom
-
-(cd $PROJECT_PATH && ./cordova/create)

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/.cordova/android/readme.md
----------------------------------------------------------------------
diff --git a/bin/templates/project/.cordova/android/readme.md b/bin/templates/project/.cordova/android/readme.md
deleted file mode 100644
index 152f5a5..0000000
--- a/bin/templates/project/.cordova/android/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-ok...

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/.cordova/readme.md
----------------------------------------------------------------------
diff --git a/bin/templates/project/.cordova/readme.md b/bin/templates/project/.cordova/readme.md
deleted file mode 100644
index ad8d878..0000000
--- a/bin/templates/project/.cordova/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-this is local config for cordova stuff to be eventually moved to
-config.xml ...we think. feedback to @davejohnson/@brianleroux
-appreciated here!

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/create
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/create b/bin/templates/project/cordova/create
deleted file mode 100755
index ebacf8b..0000000
--- a/bin/templates/project/cordova/create
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh
-#       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.
-#
-#
-# create a cordova/android project
-# 
-# USAGE
-#   ./create [path package activity]
-#
-
-# load up the config
-. ./.cordova/config
-
-PACKAGE_AS_PATH=$(echo $PACKAGE | sed 's/\./\//g')
-ACTIVITY_PATH=./src/$PACKAGE_AS_PATH/$ACTIVITY.java
-MANIFEST_PATH=./AndroidManifest.xml
-
-# create the project
-android create project --target $TARGET --path . --package $PACKAGE --activity $ACTIVITY
-
-# copy all the cordova scripts etc in there
-cp -R ./cordova/templates/project/* .
-
-# copy in cordova.js
-cp ./.cordova/android/cordova-$VERSION.js ./assets/www
-
-# copy in cordova.jar
-cp ./.cordova/android/cordova-$VERSION.jar ./libs
-
-# copy in res/xml
-mkdir ./res/xml
-cp ./.cordova/android/cordova.xml ./res/xml
-cp ./.cordova/android/plugins.xml ./res/xml
-
-# copy in default activity
-cat ./cordova/templates/Activity.java > $ACTIVITY_PATH
-
-# interpolate the acivity name and package
-find "$ACTIVITY_PATH" | xargs grep '__ACTIVITY__' -sl | xargs -L1 sed -i -e "s/__ACTIVITY__/${ACTIVITY}/g"
-find "$ACTIVITY_PATH" | xargs grep '__ID__' -sl | xargs -L1 sed -i -e "s/__ID__/${PACKAGE}/g"
-
-find "$MANIFEST_PATH" | xargs grep '__ACTIVITY__' -sl | xargs -L1 sed -i -e "s/__ACTIVITY__/${ACTIVITY}/g"
-find "$MANIFEST_PATH" | xargs grep '__PACKAGE__' -sl | xargs -L1 sed -i -e "s/__PACKAGE__/${PACKAGE}/g"

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/create.bat
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/create.bat b/bin/templates/project/cordova/create.bat
deleted file mode 100644
index cfde65a..0000000
--- a/bin/templates/project/cordova/create.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "BALLS"
-cscript cordova\create.js
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/create.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/create.js b/bin/templates/project/cordova/create.js
deleted file mode 100644
index 2bf5603..0000000
--- a/bin/templates/project/cordova/create.js
+++ /dev/null
@@ -1,69 +0,0 @@
-var shell=WScript.CreateObject("WScript.Shell");
-
-function exec(s, output) {
-    WScript.Echo('Executing ' + s);
-    var o=shell.Exec(s);
-    while (o.Status == 0) {
-        WScript.Sleep(100);
-    }
-    WScript.Echo("Command exited with code " + o.Status);
-}
-function read(filename) {
-    var fso=WScript.CreateObject("Scripting.FileSystemObject");
-    var f=fso.OpenTextFile(filename, 1);
-    var s=f.ReadAll();
-    f.Close();
-    return s;
-}
-function write(filename, contents) {
-    var fso=WScript.CreateObject("Scripting.FileSystemObject");
-    var f=fso.OpenTextFile(filename, 2, true);
-    f.Write(contents);
-    f.Close();
-}
-function replaceInFile(filename, regexp, replacement) {
-    write(filename, read(filename).replace(regexp, replacement));
-}
-
-// working dir
-var PWD = WScript.ScriptFullName.split('\\cordova\\create.js').join('');
-
-var fso=WScript.CreateObject("Scripting.FileSystemObject");
-var f=fso.OpenTextFile(PWD + '\\.cordova\\config', 1);
-while (!f.AtEndOfStream) {
-  var prop = f.ReadLine().split('=');
-  var line = 'var ' + prop[0] + '=' + "'" + prop[1] + "';";
-  eval(line); // hacky shit to load config but whatevs
-}
-
-var PACKAGE_AS_PATH=PACKAGE.replace(/\./g, '\\');
-var ACTIVITY_PATH=PWD+'\\src\\'+PACKAGE_AS_PATH+'\\'+ACTIVITY+'.java';
-var MANIFEST_PATH=PWD+'\\AndroidManifest.xml';
-
-exec('android.bat create project --target ' + TARGET + ' --path ' + PWD + ' --package ' + PACKAGE + ' --activity ' + ACTIVITY);
-
-// copy in activity and other android assets
-exec('cmd /c xcopy ' + PWD + '\\cordova\\templates\\project\\* ' + PWD +' /Y /S');
-
-// copy in cordova.js
-exec('cmd /c copy ' + PWD + '\\.cordova\\android\\cordova-' + VERSION + '.js ' + PWD + '\\assets\\www /Y');
-
-// copy in cordova.jar
-exec('cmd /c copy ' + PWD + '\\.cordova\\android\\cordova-' + VERSION + '.jar ' + PWD + '\\libs /Y');
-
-// copy in res/xml
-exec('cmd /c md ' + PWD + '\\res\\xml');
-exec('cmd /c copy ' + PWD + '\\.cordova\\android\\cordova.xml ' + PWD + '\\res\\xml /Y');
-exec('cmd /c copy ' + PWD + '\\.cordova\\android\\plugins.xml ' + PWD + '\\res\\xml /Y');
-
-// copy in default activity
-exec('cmd /c copy ' + PWD + '\\cordova\\templates\\Activity.java ' + ACTIVITY_PATH + ' /Y');
-
-// interpolate the activity name and package
-replaceInFile(ACTIVITY_PATH, /__ACTIVITY__/, ACTIVITY);
-replaceInFile(ACTIVITY_PATH, /__ID__/, PACKAGE);
-
-replaceInFile(MANIFEST_PATH, /__ACTIVITY__/, ACTIVITY);
-replaceInFile(MANIFEST_PATH, /__PACKAGE__/, PACKAGE);
-
-WScript.Echo('Create completed successfully.');
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/debug
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/debug b/bin/templates/project/cordova/debug
deleted file mode 100755
index ff6e0a3..0000000
--- a/bin/templates/project/cordova/debug
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-#       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.
-#
-#
-
-. ./.cordova/config
-
-# if there are no devices listed then emulate
-
-ant clean
-ant debug install
-adb shell am start -n $PACKAGE/$PACKAGE.$ACTIVITY

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/debug.bat
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/debug.bat b/bin/templates/project/cordova/debug.bat
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/emulate
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/emulate b/bin/templates/project/cordova/emulate
deleted file mode 100755
index 1021af5..0000000
--- a/bin/templates/project/cordova/emulate
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-#       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.
-#
-#
-
-
-#Available Android Virtual Devices:
-#    Name: default
-#    Path: /Users/davejohnson/.android/avd/default.avd
-#  Target: Android 2.2 (API level 8)
-#    Skin: WVGA800
-#  Sdcard: 100M
-
-# get the name of the first virtual device or use command line arg or use "default"
-
-emulator -cpu-delay 0 -no-boot-anim -cache ./tmp/cache -avd default > /dev/null 2>&1 & # put the avd's chatty ass in the background

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/emulate.bat
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/emulate.bat b/bin/templates/project/cordova/emulate.bat
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/log
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/log b/bin/templates/project/cordova/log
deleted file mode 100755
index da599b9..0000000
--- a/bin/templates/project/cordova/log
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh 
-#       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.
-#
-#
-
-adb logcat

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/log.bat
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/log.bat b/bin/templates/project/cordova/log.bat
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/templates/Activity.java
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/templates/Activity.java b/bin/templates/project/cordova/templates/Activity.java
deleted file mode 100644
index d37247b..0000000
--- a/bin/templates/project/cordova/templates/Activity.java
+++ /dev/null
@@ -1,35 +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 __ID__;
-
-import android.app.Activity;
-import android.os.Bundle;
-import org.apache.cordova.*;
-
-public class __ACTIVITY__ extends DroidGap
-{
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        super.loadUrl("file:///android_asset/www/index.html");
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/templates/project/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/templates/project/AndroidManifest.xml b/bin/templates/project/cordova/templates/project/AndroidManifest.xml
deleted file mode 100644
index 0cff488..0000000
--- a/bin/templates/project/cordova/templates/project/AndroidManifest.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:windowSoftInputMode="adjustPan"
-      package="__PACKAGE__" android:versionName="1.1" android:versionCode="5">
-    <supports-screens
-        android:largeScreens="true"
-        android:normalScreens="true"
-        android:smallScreens="true"
-        android:xlargeScreens="true"
-        android:resizeable="true"
-        android:anyDensity="true"
-        />
-
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.RECORD_VIDEO"/>
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />   
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />   
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-
-
-    <application android:icon="@drawable/icon" android:label="@string/app_name"
-        android:debuggable="true">
-        <activity android:name="__ACTIVITY__" android:label="@string/app_name" 
-                  android:configChanges="orientation|keyboardHidden">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-    <uses-sdk android:minSdkVersion="5" />
-</manifest> 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/templates/project/assets/www/index.html
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/templates/project/assets/www/index.html b/bin/templates/project/cordova/templates/project/assets/www/index.html
deleted file mode 100644
index 8e46f62..0000000
--- a/bin/templates/project/cordova/templates/project/assets/www/index.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-       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.
--->
-<html>
-  <head>
-    <meta name="viewport" content="width=320; user-scalable=no" />
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-    <title>PhoneGap</title>
-      <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title">
-      <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
-      <script type="text/javascript" charset="utf-8" src="main.js"></script>
-
-  </head>
-  <body onload="init();" id="stage" class="theme">
-    <h1>Welcome to Cordova!</h1>
-    <h2>this file is located at assets/www/index.html</h2>
-    <div id="info">
-        <h4>Platform: <span id="platform"> &nbsp;</span>,   Version: <span id="version">&nbsp;</span></h4>
-        <h4>UUID: <span id="uuid"> &nbsp;</span>,   Name: <span id="name">&nbsp;</span></h4>
-        <h4>Width: <span id="width"> &nbsp;</span>,   Height: <span id="height">&nbsp;
-                   </span>, Color Depth: <span id="colorDepth"></span></h4>
-     </div>
-    <dl id="accel-data">
-      <dt>X:</dt><dd id="x">&nbsp;</dd>
-      <dt>Y:</dt><dd id="y">&nbsp;</dd>
-      <dt>Z:</dt><dd id="z">&nbsp;</dd>
-    </dl>
-    <a href="#" class="btn large" onclick="toggleAccel();">Toggle Accelerometer</a>
-    <a href="#" class="btn large" onclick="getLocation();">Get Location</a>
-    <a href="tel:411" class="btn large">Call 411</a>
-    <a href="#" class="btn large" onclick="beep();">Beep</a>
-    <a href="#" class="btn large" onclick="vibrate();">Vibrate</a>
-    <a href="#" class="btn large" onclick="show_pic();">Get a Picture</a>
-    <a href="#" class="btn large" onclick="get_contacts();return false;">Get Phone's Contacts</a>
-    <a href="#" class="btn large" onclick="check_network();return false;">Check Network</a>
-    <dl>
-    <dt>Compass Heading:</dt><dd id="h">Off</dd>
-    </dl>
-    <a href="#" class="btn large" onclick="toggleCompass();return false;">Toggle Compass</a>
-    <div id="viewport" class="viewport" style="display: none;">
-      <img style="width:60px;height:60px" id="test_img" src="" />
-    </div>
-  </body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/templates/project/assets/www/main.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/templates/project/assets/www/main.js b/bin/templates/project/cordova/templates/project/assets/www/main.js
deleted file mode 100644
index 3a8b04a..0000000
--- a/bin/templates/project/cordova/templates/project/assets/www/main.js
+++ /dev/null
@@ -1,165 +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.
-*/
-
-var deviceInfo = function() {
-    document.getElementById("platform").innerHTML = device.platform;
-    document.getElementById("version").innerHTML = device.version;
-    document.getElementById("uuid").innerHTML = device.uuid;
-    document.getElementById("name").innerHTML = device.name;
-    document.getElementById("width").innerHTML = screen.width;
-    document.getElementById("height").innerHTML = screen.height;
-    document.getElementById("colorDepth").innerHTML = screen.colorDepth;
-};
-
-var getLocation = function() {
-    var suc = function(p) {
-        alert(p.coords.latitude + " " + p.coords.longitude);
-    };
-    var locFail = function() {
-    };
-    navigator.geolocation.getCurrentPosition(suc, locFail);
-};
-
-var beep = function() {
-    navigator.notification.beep(2);
-};
-
-var vibrate = function() {
-    navigator.notification.vibrate(0);
-};
-
-function roundNumber(num) {
-    var dec = 3;
-    var result = Math.round(num * Math.pow(10, dec)) / Math.pow(10, dec);
-    return result;
-}
-
-var accelerationWatch = null;
-
-function updateAcceleration(a) {
-    document.getElementById('x').innerHTML = roundNumber(a.x);
-    document.getElementById('y').innerHTML = roundNumber(a.y);
-    document.getElementById('z').innerHTML = roundNumber(a.z);
-}
-
-var toggleAccel = function() {
-    if (accelerationWatch !== null) {
-        navigator.accelerometer.clearWatch(accelerationWatch);
-        updateAcceleration({
-            x : "",
-            y : "",
-            z : ""
-        });
-        accelerationWatch = null;
-    } else {
-        var options = {};
-        options.frequency = 1000;
-        accelerationWatch = navigator.accelerometer.watchAcceleration(
-                updateAcceleration, function(ex) {
-                    alert("accel fail (" + ex.name + ": " + ex.message + ")");
-                }, options);
-    }
-};
-
-var preventBehavior = function(e) {
-    e.preventDefault();
-};
-
-function dump_pic(data) {
-    var viewport = document.getElementById('viewport');
-    console.log(data);
-    viewport.style.display = "";
-    viewport.style.position = "absolute";
-    viewport.style.top = "10px";
-    viewport.style.left = "10px";
-    document.getElementById("test_img").src = data;
-}
-
-function fail(msg) {
-    alert(msg);
-}
-
-function show_pic() {
-    navigator.camera.getPicture(dump_pic, fail, {
-        quality : 50
-    });
-}
-
-function close() {
-    var viewport = document.getElementById('viewport');
-    viewport.style.position = "relative";
-    viewport.style.display = "none";
-}
-
-function contacts_success(contacts) {
-    alert(contacts.length
-            + ' contacts returned.'
-            + (contacts[2] && contacts[2].name ? (' Third contact is ' + contacts[2].name.formatted)
-                    : ''));
-}
-
-function get_contacts() {
-    var obj = new ContactFindOptions();
-    obj.filter = "";
-    obj.multiple = true;
-    navigator.contacts.find(
-            [ "displayName", "name" ], contacts_success,
-            fail, obj);
-}
-
-function check_network() {
-    var networkState = navigator.network.connection.type;
-
-    var states = {};
-    states[Connection.UNKNOWN]  = 'Unknown connection';
-    states[Connection.ETHERNET] = 'Ethernet connection';
-    states[Connection.WIFI]     = 'WiFi connection';
-    states[Connection.CELL_2G]  = 'Cell 2G connection';
-    states[Connection.CELL_3G]  = 'Cell 3G connection';
-    states[Connection.CELL_4G]  = 'Cell 4G connection';
-    states[Connection.NONE]     = 'No network connection';
-
-    confirm('Connection type:\n ' + states[networkState]);
-}
-
-var watchID = null;
-
-function updateHeading(h) {
-    document.getElementById('h').innerHTML = h.magneticHeading;
-}
-
-function toggleCompass() {
-    if (watchID !== null) {
-        navigator.compass.clearWatch(watchID);
-        watchID = null;
-        updateHeading({ magneticHeading : "Off"});
-    } else {        
-        var options = { frequency: 1000 };
-        watchID = navigator.compass.watchHeading(updateHeading, function(e) {
-            alert('Compass Error: ' + e.code);
-        }, options);
-    }
-}
-
-function init() {
-    // the next line makes it impossible to see Contacts on the HTC Evo since it
-    // doesn't have a scroll button
-    // document.addEventListener("touchmove", preventBehavior, false);
-    document.addEventListener("deviceready", deviceInfo, true);
-}

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/templates/project/assets/www/master.css
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/templates/project/assets/www/master.css b/bin/templates/project/cordova/templates/project/assets/www/master.css
deleted file mode 100644
index 3aad33d..0000000
--- a/bin/templates/project/cordova/templates/project/assets/www/master.css
+++ /dev/null
@@ -1,116 +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.
-*/
-
-
- body {
-    background:#222 none repeat scroll 0 0;
-    color:#666;
-    font-family:Helvetica;
-    font-size:72%;
-    line-height:1.5em;
-    margin:0;
-    border-top:1px solid #393939;
-  }
-
-  #info{
-    background:#ffa;
-    border: 1px solid #ffd324;
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
-    clear:both;
-    margin:15px 6px 0;
-    width:295px;
-    padding:4px 0px 2px 10px;
-  }
-  
-  #info > h4{
-    font-size:.95em;
-    margin:5px 0;
-  }
- 	
-  #stage.theme{
-    padding-top:3px;
-  }
-
-  /* Definition List */
-  #stage.theme > dl{
-  	padding-top:10px;
-  	clear:both;
-  	margin:0;
-  	list-style-type:none;
-  	padding-left:10px;
-  	overflow:auto;
-  }
-
-  #stage.theme > dl > dt{
-  	font-weight:bold;
-  	float:left;
-  	margin-left:5px;
-  }
-
-  #stage.theme > dl > dd{
-  	width:45px;
-  	float:left;
-  	color:#a87;
-  	font-weight:bold;
-  }
-
-  /* Content Styling */
-  #stage.theme > h1, #stage.theme > h2, #stage.theme > p{
-    margin:1em 0 .5em 13px;
-  }
-
-  #stage.theme > h1{
-    color:#eee;
-    font-size:1.6em;
-    text-align:center;
-    margin:0;
-    margin-top:15px;
-    padding:0;
-  }
-
-  #stage.theme > h2{
-  	clear:both;
-    margin:0;
-    padding:3px;
-    font-size:1em;
-    text-align:center;
-  }
-
-  /* Stage Buttons */
-  #stage.theme a.btn{
-  	border: 1px solid #555;
-  	-webkit-border-radius: 5px;
-  	border-radius: 5px;
-  	text-align:center;
-  	display:block;
-  	float:left;
-  	background:#444;
-  	width:150px;
-  	color:#9ab;
-  	font-size:1.1em;
-  	text-decoration:none;
-  	padding:1.2em 0;
-  	margin:3px 0px 3px 5px;
-  }
-  #stage.theme a.btn.large{
-  	width:308px;
-  	padding:1.2em 0;
-  }
-

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/templates/project/res/drawable-hdpi/icon.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/templates/project/res/drawable-hdpi/icon.png b/bin/templates/project/cordova/templates/project/res/drawable-hdpi/icon.png
deleted file mode 100644
index 4d27634..0000000
Binary files a/bin/templates/project/cordova/templates/project/res/drawable-hdpi/icon.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/templates/project/res/drawable-ldpi/icon.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/templates/project/res/drawable-ldpi/icon.png b/bin/templates/project/cordova/templates/project/res/drawable-ldpi/icon.png
deleted file mode 100644
index cd5032a..0000000
Binary files a/bin/templates/project/cordova/templates/project/res/drawable-ldpi/icon.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/templates/project/res/drawable-mdpi/icon.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/templates/project/res/drawable-mdpi/icon.png b/bin/templates/project/cordova/templates/project/res/drawable-mdpi/icon.png
deleted file mode 100644
index e79c606..0000000
Binary files a/bin/templates/project/cordova/templates/project/res/drawable-mdpi/icon.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/templates/project/res/drawable-xhdpi/icon.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/templates/project/res/drawable-xhdpi/icon.png b/bin/templates/project/cordova/templates/project/res/drawable-xhdpi/icon.png
deleted file mode 100644
index ec7ffbf..0000000
Binary files a/bin/templates/project/cordova/templates/project/res/drawable-xhdpi/icon.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/447af8da/bin/templates/project/cordova/templates/project/res/drawable/icon.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/templates/project/res/drawable/icon.png b/bin/templates/project/cordova/templates/project/res/drawable/icon.png
deleted file mode 100644
index ec7ffbf..0000000
Binary files a/bin/templates/project/cordova/templates/project/res/drawable/icon.png and /dev/null differ